Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(687)

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 10538052: Allow --aura-host-window-use-fullscreen to be used without chromeos=1. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..80da70071512d98abf885d81824e1d3af4612425 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);
aura::RootWindow::set_hide_host_cursor(true);
Daniel Erat 2012/06/08 13:25:04 I think that this should probably be within the OS
+#if defined(OS_CHROMEOS)
// 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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698