From 2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Mon, 17 Mar 2014 23:07:15 +0000 Subject: Move CommandLine to base namespace. Fix all forward-declares and header files referencing CommandLine. This keeps a "using base::CommandLine" in the command line header file so that the rest of the source files can be changes in a follow-up. TBR=sky Review URL: https://codereview.chromium.org/196413016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257514 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/desktop_background/desktop_background_controller.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'ash/desktop_background') diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h index 38c08c3..d7c1d06 100644 --- a/ash/desktop_background/desktop_background_controller.h +++ b/ash/desktop_background/desktop_background_controller.h @@ -19,12 +19,14 @@ typedef unsigned int SkColor; -class CommandLine; - namespace aura { class Window; } +namespace base { +class CommandLine; +} + namespace ash { enum WallpaperLayout { @@ -81,7 +83,7 @@ class ASH_EXPORT DesktopBackgroundController return desktop_background_mode_; } - void set_command_line_for_testing(CommandLine* command_line) { + void set_command_line_for_testing(base::CommandLine* command_line) { command_line_for_testing_ = command_line; } @@ -189,7 +191,7 @@ class ASH_EXPORT DesktopBackgroundController static gfx::Size GetMaxDisplaySizeInNative(); // If non-NULL, used in place of the real command line. - CommandLine* command_line_for_testing_; + base::CommandLine* command_line_for_testing_; // Can change at runtime. bool locked_; -- cgit v1.1