| Index: trunk/src/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
|
| ===================================================================
|
| --- trunk/src/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc (revision 192508)
|
| +++ trunk/src/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc (working copy)
|
| @@ -19,7 +19,6 @@
|
| #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 {
|
| @@ -61,9 +60,9 @@
|
| 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;
|
|
|