Unified Desktop: hook up ash to allow unified desktop mode

ash/ash_switches.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 "ash/ash_switches.h"
 
 #include "base/command_line.h"
+#include "base/sys_info.h"
 
 namespace ash {
 namespace switches {
 
 // Enables an animated transition from the boot splash screen (Chrome logo on a
 // white background) to the login screen.  Implies
 // |kAshCopyHostBackgroundAtBoot| and doesn't make much sense if used in
 // conjunction with |kDisableBootAnimation| (since the transition begins at the
 // same time as the white/grayscale login screen animation).
 const char kAshAnimateFromBootSplashScreen[] =
     "ash-animate-from-boot-splash-screen";
 
-// Constrains the pointer movement within a root window on desktop.
-const char kAshConstrainPointerToRoot[] = "ash-constrain-pointer-to-root";
-
 // Copies the host window's content to the system background layer at startup.
 // Can make boot slightly slower, but also hides an even-longer awkward period
 // where we display a white background if the login wallpaper takes a long time
 // to load.
 const char kAshCopyHostBackgroundAtBoot[] = "ash-copy-host-background-at-boot";
 
 // Enable keyboard shortcuts useful for debugging.
 const char kAshDebugShortcuts[] = "ash-debug-shortcuts";
 
 // Disables LockLayoutManager used for LockScreenContainer, return back to
@@ skipping 16 matching lines @@
 const char kAshDisableTouchExplorationMode[] =
     "ash-disable-touch-exploration-mode";
 
 #if defined(OS_CHROMEOS)
 // Enables fullscreen app list if Ash is in maximize mode.
 const char kAshEnableFullscreenAppList[] = "ash-enable-fullscreen-app-list";
 
 // Enables key bindings to scroll magnified screen.
 const char kAshEnableMagnifierKeyScroller[] =
     "ash-enable-magnifier-key-scroller";
+
 #endif
 
 // Enables mirrored screen.
 const char kAshEnableMirroredScreen[] = "ash-enable-mirrored-screen";
 
 // Enables quick, non-cancellable locking of the screen when in maximize mode.
 const char kAshEnablePowerButtonQuickLock[] =
     "ash-enable-power-button-quick-lock";
 
 // Specifies the screen rotation animation to use. Possible values are:
@@ skipping 46 matching lines @@
 // instead of displaying an interactive animation.
 const char kAuraLegacyPowerButton[] = "aura-legacy-power-button";
 
 #if defined(OS_WIN)
 // Force Ash to open its root window on the desktop, even on Windows 8 where
 // it would normally end up in metro.
 const char kForceAshToDesktop[] = "ash-force-desktop";
 
 #endif
 
+#if defined(OS_CHROMEOS)
+// Constrains the pointer movement within a root window on desktop.
+bool ConstrainPointerToRoot() {
+  const char kAshConstrainPointerToRoot[] = "ash-constrain-pointer-to-root";
+
+  return base::SysInfo::IsRunningOnChromeOS() ||
+         base::CommandLine::ForCurrentProcess()->HasSwitch(
+             kAshConstrainPointerToRoot);
+}
+
+// Enables unified desktop mode.
+bool UnifiedDesktopEnabled() {
+  const char kAshEnableUnifiedDesktop[] = "ash-enable-unified-desktop";
+  return base::CommandLine::ForCurrentProcess()->HasSwitch(
+      kAshEnableUnifiedDesktop);
+}
+
+#endif
+
 }  // namespace switches
 }  // namespace ash