win: Fix compiler warning
authorCheng Zhao <zcbenz@gmail.com>
Tue, 11 Aug 2015 15:38:59 +0000 (23:38 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Tue, 11 Aug 2015 15:41:43 +0000 (23:41 +0800)
atom/browser/atom_browser_client.cc
script/lib/config.py

index 6b34192..f116af0 100644 (file)
@@ -69,7 +69,8 @@ ProcessOwner GetProcessOwner(int process_id,
     return OWNER_NONE;
 
   // First search for NativeWindow.
-  if ((*window = NativeWindow::FromWebContents(web_contents)))
+  *window = NativeWindow::FromWebContents(web_contents);
+  if (window)
     return OWNER_NATIVE_WINDOW;
 
   // Then search for guest WebContents.
index 7132b9d..9a5979b 100644 (file)
@@ -8,7 +8,7 @@ import sys
 
 BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \
     'http://github-janky-artifacts.s3.amazonaws.com/libchromiumcontent'
-LIBCHROMIUMCONTENT_COMMIT = '21768a17f4f1203a50df5c0908b788fa2ecb96ab'
+LIBCHROMIUMCONTENT_COMMIT = 'e667b7cc5a04bc8e64960d47079d99446a263e85'
 
 PLATFORM = {
   'cygwin': 'win32',