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

Unified Diff: chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc

Issue 13671005: Re-apply 192420: Move login switches to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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/background/ash_user_wallpaper_delegate.cc
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
index b9b81cf2153b97164b72fd95d7150366334a8b5e..b272a0821c67eb4db86f6dfd04dee4f1e523afa3 100644
--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -19,6 +19,7 @@
#include "chrome/browser/ui/chrome_pages.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
+#include "chromeos/chromeos_switches.h"
#include "content/public/browser/notification_service.h"
namespace chromeos {
@@ -60,9 +61,9 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
bool is_registered = WizardController::IsDeviceRegistered();
const CommandLine* command_line = CommandLine::ForCurrentProcess();
bool disable_boot_animation = command_line->
- HasSwitch(switches::kDisableBootAnimation);
+ HasSwitch(::switches::kDisableBootAnimation);
bool disable_oobe_animation = command_line->
- HasSwitch(switches::kDisableOobeAnimation);
+ HasSwitch(::switches::kDisableOobeAnimation);
if ((!is_registered && disable_oobe_animation) ||
(is_registered && disable_boot_animation))
return false;

Powered by Google App Engine
This is Rietveld 408576698