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

Side by Side Diff: ash/ash_switches.cc

Issue 1261693004: Allow dynamic enabling/disabling of unified desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « ash/ash_switches.h ('k') | ash/display/display_layout.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/ash_switches.h" 5 #include "ash/ash_switches.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/sys_info.h" 8 #include "base/sys_info.h"
9 9
10 namespace ash { 10 namespace ash {
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 #if defined(OS_CHROMEOS) 129 #if defined(OS_CHROMEOS)
130 // Constrains the pointer movement within a root window on desktop. 130 // Constrains the pointer movement within a root window on desktop.
131 bool ConstrainPointerToRoot() { 131 bool ConstrainPointerToRoot() {
132 const char kAshConstrainPointerToRoot[] = "ash-constrain-pointer-to-root"; 132 const char kAshConstrainPointerToRoot[] = "ash-constrain-pointer-to-root";
133 133
134 return base::SysInfo::IsRunningOnChromeOS() || 134 return base::SysInfo::IsRunningOnChromeOS() ||
135 base::CommandLine::ForCurrentProcess()->HasSwitch( 135 base::CommandLine::ForCurrentProcess()->HasSwitch(
136 kAshConstrainPointerToRoot); 136 kAshConstrainPointerToRoot);
137 } 137 }
138 138
139 bool UnifiedDesktopEnabled() {
140 return base::CommandLine::ForCurrentProcess()->HasSwitch(
141 kAshEnableUnifiedDesktop);
142 }
143
144 #endif 139 #endif
145 140
146 } // namespace switches 141 } // namespace switches
147 } // namespace ash 142 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_switches.h ('k') | ash/display/display_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698