Merge 161217 - Fix a regression which caused Chrome to always launch in Windows 8 mode on tablets. …

chrome/browser/process_singleton_win.cc

Index: chrome/browser/process_singleton_win.cc
===================================================================
--- chrome/browser/process_singleton_win.cc	(revision 161219)
+++ chrome/browser/process_singleton_win.cc	(working copy)
@@ -26,6 +26,7 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/wmi.h"
@@ -199,16 +200,19 @@
   if (default_user_data_dir != user_data_dir)
     return false;
 
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUninstall))
+    return false;
+
   base::win::RegKey reg_key;
   LONG key_result = reg_key.Create(HKEY_CURRENT_USER,
                                    chrome::kMetroRegistryPath,
                                    KEY_READ);
   if (key_result == ERROR_SUCCESS) {
     DWORD reg_value = 0;
-    reg_key.ReadValueDW(chrome::kLaunchModeValue,
-                        &reg_value);
-    if (reg_value == 1)
-      return true;
+    if (reg_key.ReadValueDW(chrome::kLaunchModeValue, &reg_value)
+          == ERROR_SUCCESS) {
+      return reg_value == 1;
+    }
   }
   return base::win::IsMachineATablet();
 }