Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
index 2bd5eeba2f126e176d7e24d2c2190731e3485459..0ab2014125e583289cc7519e255c7202f641bfd0 100644 |
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
@@ -42,17 +42,23 @@ ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() { |
} |
void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
+ bool use_fullscreen = CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kAuraHostWindowUseFullscreen); |
+ |
#if defined(OS_CHROMEOS) |
- if (base::chromeos::IsRunningOnChromeOS() || |
- CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kAuraHostWindowUseFullscreen)) { |
+ if (base::chromeos::IsRunningOnChromeOS()) |
+ use_fullscreen = true; |
+#endif |
+ |
+ if (use_fullscreen) { |
aura::MonitorManager::set_use_fullscreen_host_window(true); |
+#if defined(OS_CHROMEOS) |
aura::RootWindow::set_hide_host_cursor(true); |
// Hide the mouse cursor completely at boot. |
if (!chromeos::UserManager::Get()->IsUserLoggedIn()) |
ash::Shell::set_initially_hide_cursor(true); |
- } |
#endif |
+ } |
// Its easier to mark all windows as persisting and exclude the ones we care |
// about (browser windows), rather than explicitly excluding certain windows. |