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

chrome/browser/process_singleton_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/process_singleton.h"
 
 #include <shellapi.h>
 #include <shobjidl.h>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/metro.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_com_initializer.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/win_util.h"
 #include "base/win/windows_version.h"
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/ui/simple_message_box.h"
 #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"
 #include "content/public/common/result_codes.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/win/hwnd_util.h"
 
@@ skipping 153 matching lines @@
   if (integrity_level == base::HIGH_INTEGRITY)
     return false;
 
   FilePath default_user_data_dir;
   if (!chrome::GetDefaultUserDataDirectory(&default_user_data_dir))
     return false;
 
   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();
 }
 
 }  // namespace
 
 // Microsoft's Softricity virtualization breaks the sandbox processes.
 // So, if we detect the Softricity DLL we use WMI Win32_Process.Create to
 // break out of the virtualization environment.
 // http://code.google.com/p/chromium/issues/detail?id=43650
@@ skipping 295 matching lines @@
   switch (message) {
     case WM_COPYDATA:
       return OnCopyData(reinterpret_cast<HWND>(wparam),
                         reinterpret_cast<COPYDATASTRUCT*>(lparam));
     default:
       break;
   }
 
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }