OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" | 5 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h" |
6 | 6 |
7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
8 #include "ash/desktop_background/user_wallpaper_delegate.h" | 8 #include "ash/desktop_background/user_wallpaper_delegate.h" |
9 #include "ash/wm/window_animations.h" | 9 #include "ash/wm/window_animations.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chromeos/chromeos_switches.h" | 21 #include "chromeos/chromeos_switches.h" |
22 #include "chromeos/login/login_state.h" | 22 #include "chromeos/login/login_state.h" |
23 #include "content/public/browser/notification_service.h" | 23 #include "content/public/browser/notification_service.h" |
24 | 24 |
25 namespace chromeos { | 25 namespace chromeos { |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 bool IsNormalWallpaperChange() { | 29 bool IsNormalWallpaperChange() { |
30 if (chromeos::LoginState::Get()->IsUserLoggedIn() || | 30 if (chromeos::LoginState::Get()->IsUserLoggedIn() || |
31 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kFirstBoot) || | 31 !CommandLine::ForCurrentProcess()->HasSwitch( |
| 32 switches::kFirstExecAfterBoot) || |
32 WizardController::IsZeroDelayEnabled() || | 33 WizardController::IsZeroDelayEnabled() || |
33 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager)) { | 34 !CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager)) { |
34 return true; | 35 return true; |
35 } | 36 } |
36 | 37 |
37 return false; | 38 return false; |
38 } | 39 } |
39 | 40 |
40 class UserWallpaperDelegate : public ash::UserWallpaperDelegate { | 41 class UserWallpaperDelegate : public ash::UserWallpaperDelegate { |
41 public: | 42 public: |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); | 106 DISALLOW_COPY_AND_ASSIGN(UserWallpaperDelegate); |
106 }; | 107 }; |
107 | 108 |
108 } // namespace | 109 } // namespace |
109 | 110 |
110 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { | 111 ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() { |
111 return new chromeos::UserWallpaperDelegate(); | 112 return new chromeos::UserWallpaperDelegate(); |
112 } | 113 } |
113 | 114 |
114 } // namespace chromeos | 115 } // namespace chromeos |
OLD | NEW |