summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
Diffstat (limited to 'ash')
-rw-r--r--ash/desktop_background/desktop_background_controller.h10
-rw-r--r--ash/shell.h2
2 files changed, 6 insertions, 6 deletions
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_;
diff --git a/ash/shell.h b/ash/shell.h
index f19645f..ddb59b6 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -28,8 +28,6 @@
#include "ui/gfx/size.h"
#include "ui/wm/core/cursor_manager.h"
-class CommandLine;
-
namespace app_list {
class AppListView;
}