Chromium Code Reviews| Index: chrome/browser/process_singleton_win.cc |
| diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc |
| index c5f0f9997f69c345fc23db151fb75c083f28a67c..63a0c48fe990fecb472cd33787b2ab50ef3c8209 100644 |
| --- a/chrome/browser/process_singleton_win.cc |
| +++ b/chrome/browser/process_singleton_win.cc |
| @@ -186,45 +186,11 @@ bool ProcessLaunchNotification( |
| // Move this function to a common place as the Windows 8 delegate_execute |
| // handler can possibly use this. |
| bool ShouldLaunchInWindows8ImmersiveMode(const base::FilePath& user_data_dir) { |
| -#if defined(USE_AURA) |
|
rvargas (doing something else)
2015/02/12 22:47:12
I still see 460 uses of this definition.
cpu_(ooo_6.6-7.5)
2015/02/13 00:25:12
Mac is not yet aura so I hope that is the bulk of
|
| // Returning false from this function doesn't mean we don't launch immersive |
| // mode in Aura. This function is specifically called in case when we need |
| // to relaunch desktop launched chrome into immersive mode through 'relaunch' |
| // menu. In case of Aura, we will use delegate_execute to do the relaunch. |
| return false; |
| -#else |
| - if (base::win::GetVersion() < base::win::VERSION_WIN8) |
| - return false; |
| - |
| - if (base::win::IsProcessImmersive(base::GetCurrentProcessHandle())) |
|
cpu_(ooo_6.6-7.5)
2015/02/13 00:25:12
I believe IsProcessImmersive can be removed from b
rvargas (doing something else)
2015/02/13 02:53:19
There are still two callers and I'm not sure it is
|
| - return false; |
| - |
| - if (ShellIntegration::GetDefaultBrowser() != ShellIntegration::IS_DEFAULT) |
| - return false; |
| - |
| - base::IntegrityLevel integrity_level = base::INTEGRITY_UNKNOWN; |
| - base::GetProcessIntegrityLevel(base::GetCurrentProcessHandle(), |
| - &integrity_level); |
| - if (integrity_level == base::HIGH_INTEGRITY) |
| - return false; |
| - |
| - base::FilePath default_user_data_dir; |
| - if (!chrome::GetDefaultUserDataDirectory(&default_user_data_dir)) |
| - return false; |
| - |
| - if (default_user_data_dir != user_data_dir) |
| - return false; |
| - |
| - base::win::RegKey reg_key; |
| - DWORD reg_value = 0; |
| - if (reg_key.Create(HKEY_CURRENT_USER, chrome::kMetroRegistryPath, |
| - KEY_READ) == ERROR_SUCCESS && |
| - reg_key.ReadValueDW(chrome::kLaunchModeValue, |
| - ®_value) == ERROR_SUCCESS) { |
| - return reg_value == 1; |
| - } |
| - return false; |
| -#endif |
| } |
| } // namespace |