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

Unified Diff: ash/common/ash_switches.cc

Issue 2616023005: cros: Remove OS_CHROMEOS ifdefs in ash/common (Closed)
Patch Set: review comments Created 3 years, 11 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 | « ash/common/ash_switches.h ('k') | ash/common/devtools/ash_devtools_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/ash_switches.cc
diff --git a/ash/common/ash_switches.cc b/ash/common/ash_switches.cc
index d3d957174c9567ff16cf2d2a67287104cea5da74..e9eb255ddae2d24c172b000b2d2b7c5c91c202c9 100644
--- a/ash/common/ash_switches.cc
+++ b/ash/common/ash_switches.cc
@@ -34,11 +34,9 @@ const char kAshDeveloperShortcuts[] = "ash-dev-shortcuts";
const char kAshDisableMaximizeModeWindowBackdrop[] =
"ash-disable-maximize-mode-window-backdrop";
-#if defined(OS_CHROMEOS)
// Disable the support for WebContents to lock the screen orientation.
const char kAshDisableScreenOrientationLock[] =
"ash-disable-screen-orientation-lock";
-#endif
// Disable the Touch Exploration Mode. Touch Exploration Mode will no longer be
// turned on automatically when spoken feedback is enabled when this flag is
@@ -46,7 +44,6 @@ const char kAshDisableScreenOrientationLock[] =
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";
@@ -60,7 +57,6 @@ const char kAshEnablePalette[] = "ash-enable-palette";
// Enables the palette on every display, instead of only the internal one.
const char kAshEnablePaletteOnAllDisplays[] =
"ash-enable-palette-on-all-displays";
-#endif
// Enables the observation of accelerometer events to enter touch-view mode.
const char kAshEnableTouchView[] = "enable-touchview";
@@ -94,7 +90,6 @@ const char kAshTouchHud[] = "ash-touch-hud";
// instead of displaying an interactive animation.
const char kAuraLegacyPowerButton[] = "aura-legacy-power-button";
-#if defined(OS_CHROMEOS)
// Constrains the pointer movement within a root window on desktop.
bool ConstrainPointerToRoot() {
const char kAshConstrainPointerToRoot[] = "ash-constrain-pointer-to-root";
@@ -104,7 +99,5 @@ bool ConstrainPointerToRoot() {
kAshConstrainPointerToRoot);
}
-#endif
-
} // namespace switches
} // namespace ash
« no previous file with comments | « ash/common/ash_switches.h ('k') | ash/common/devtools/ash_devtools_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698