mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

win: Fix compiler warning

Browse source
This commit is contained in:
Cheng Zhao 2015-08-11 23:38:59 +08:00
parent a8681b0072
commit 1e9eaba423
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
atom/browser/atom_browser_client.cc
View file

@ -69,7 +69,8 @@ ProcessOwner GetProcessOwner(int process_id,
return OWNER_NONE; return OWNER_NONE;
// First search for NativeWindow. // First search for NativeWindow.
if ((*window = NativeWindow::FromWebContents(web_contents))) *window = NativeWindow::FromWebContents(web_contents);
if (window)
return OWNER_NATIVE_WINDOW; return OWNER_NATIVE_WINDOW;
// Then search for guest WebContents. // Then search for guest WebContents.

2
script/lib/config.py
View file

@ -8,7 +8,7 @@ import sys
BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
'http://github-janky-artifacts.s3.amazonaws.com/libchromiumcontent' 'http://github-janky-artifacts.s3.amazonaws.com/libchromiumcontent'
LIBCHROMIUMCONTENT_COMMIT = '21768a17f4f1203a50df5c0908b788fa2ecb96ab' LIBCHROMIUMCONTENT_COMMIT = 'e667b7cc5a04bc8e64960d47079d99446a263e85'
PLATFORM = { PLATFORM = {
'cygwin': 'win32', 'cygwin': 'win32',