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

Unified Diff: ash/root_window_controller.cc

Issue 684783004: Prefix CommandLine usage with base namespace (Part 4: ash/) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 2 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/host/ash_window_tree_host_win.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index 68e15ab5882e0ad66c22bd1b885c83dda13f4abd..fb41c216680694735725f72da187cd46094cd1da 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -422,7 +422,7 @@ void RootWindowController::UpdateAfterLoginStatusChange(
void RootWindowController::HandleInitialDesktopBackgroundAnimationStarted() {
#if defined(OS_CHROMEOS)
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshAnimateFromBootSplashScreen) &&
boot_splash_screen_.get()) {
// Make the splash screen fade out so it doesn't obscure the desktop
@@ -722,7 +722,7 @@ void RootWindowController::Init(RootWindowType root_window_type,
}
#if defined(OS_CHROMEOS)
- if (!CommandLine::ForCurrentProcess()->HasSwitch(
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshDisableTouchExplorationMode)) {
touch_exploration_manager_.reset(new AshTouchExplorationManager(this));
}
@@ -800,7 +800,7 @@ void RootWindowController::InitLayoutManagers() {
}
void RootWindowController::InitTouchHuds() {
- CommandLine* command_line = CommandLine::ForCurrentProcess();
+ base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
if (command_line->HasSwitch(switches::kAshTouchHud))
set_touch_hud_debug(new TouchHudDebug(GetRootWindow()));
if (Shell::GetInstance()->is_touch_hud_projection_enabled())
@@ -821,9 +821,9 @@ void RootWindowController::CreateSystemBackground(
// Make a copy of the system's boot splash screen so we can composite it
// onscreen until the desktop background is ready.
if (is_first_run_after_boot &&
- (CommandLine::ForCurrentProcess()->HasSwitch(
+ (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshCopyHostBackgroundAtBoot) ||
- CommandLine::ForCurrentProcess()->HasSwitch(
+ base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshAnimateFromBootSplashScreen)))
boot_splash_screen_.reset(new BootSplashScreen(GetHost()));
#endif
@@ -945,7 +945,7 @@ void RootWindowController::CreateContainersInRootWindow(
"LockScreenContainer",
lock_screen_containers);
wm::SetSnapsChildrenToPhysicalPixelBoundary(lock_container);
- if (CommandLine::ForCurrentProcess()->HasSwitch(
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kAshDisableLockLayoutManager)) {
lock_container->SetLayoutManager(
new WorkspaceLayoutManager(lock_container));
« no previous file with comments | « ash/host/ash_window_tree_host_win.cc ('k') | ash/root_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698