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

Unified Diff: chrome/browser/chromeos/login/wallpaper_manager.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
Index: chrome/browser/chromeos/login/wallpaper_manager.h
diff --git a/chrome/browser/chromeos/login/wallpaper_manager.h b/chrome/browser/chromeos/login/wallpaper_manager.h
index 56b5433be075934023ff5ef78bd48e447b84abcf..936a54c6bc6c916f19b60f2458aae9a94df7599b 100644
--- a/chrome/browser/chromeos/login/wallpaper_manager.h
+++ b/chrome/browser/chromeos/login/wallpaper_manager.h
@@ -26,10 +26,10 @@
#include "third_party/icu/source/i18n/unicode/timezone.h"
#include "ui/gfx/image/image_skia.h"
-class CommandLine;
class PrefRegistrySimple;
namespace base {
+class CommandLine;
class SequencedTaskRunner;
}
@@ -171,7 +171,7 @@ class WallpaperManager: public content::NotificationObserver {
WallpaperManager();
virtual ~WallpaperManager();
- 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;
}
@@ -354,7 +354,7 @@ class WallpaperManager: public content::NotificationObserver {
void EnsureCustomWallpaperDirectories(const std::string& user_id_hash);
// Gets the CommandLine representing the current process's command line.
- CommandLine* GetComandLine();
+ base::CommandLine* GetComandLine();
// Initialize wallpaper of registered device after device policy is trusted.
// Note that before device is enrolled, it proceeds with untrusted setting.
@@ -481,7 +481,7 @@ class WallpaperManager: public content::NotificationObserver {
WallpaperInfo current_user_wallpaper_info_;
// If non-NULL, used in place of the real command line.
- CommandLine* command_line_for_testing_;
+ base::CommandLine* command_line_for_testing_;
// Caches wallpapers of users. Accessed only on UI thread.
CustomWallpaperMap wallpaper_cache_;
« no previous file with comments | « chrome/browser/chromeos/login/oobe_base_test.h ('k') | chrome/browser/chromeos/login/wizard_in_process_browser_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698