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

Unified Diff: ash/desktop_background/desktop_background_controller.h

Issue 196413016: Move CommandLine to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | « apps/shell/browser/shell_extensions_browser_client.h ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/desktop_background/desktop_background_controller.h
diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
index 38c08c31c5b32af1abca439d693b2930670c399a..d7c1d06b263a481a85990835150136ebfc08de8a 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_;
« no previous file with comments | « apps/shell/browser/shell_extensions_browser_client.h ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698