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

Side by Side Diff: chrome/browser/chromeos/login/wallpaper_manager.cc

Issue 14820030: Move Chrome OS switches to chromeos/chromeos_switches.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nits Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/login/wallpaper_manager.h" 5 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/browser/chromeos/login/startup_utils.h" 25 #include "chrome/browser/chromeos/login/startup_utils.h"
26 #include "chrome/browser/chromeos/login/user.h" 26 #include "chrome/browser/chromeos/login/user.h"
27 #include "chrome/browser/chromeos/login/user_manager.h" 27 #include "chrome/browser/chromeos/login/user_manager.h"
28 #include "chrome/browser/chromeos/login/wizard_controller.h" 28 #include "chrome/browser/chromeos/login/wizard_controller.h"
29 #include "chrome/browser/chromeos/settings/cros_settings.h" 29 #include "chrome/browser/chromeos/settings/cros_settings.h"
30 #include "chrome/browser/prefs/scoped_user_pref_update.h" 30 #include "chrome/browser/prefs/scoped_user_pref_update.h"
31 #include "chrome/common/chrome_notification_types.h" 31 #include "chrome/common/chrome_notification_types.h"
32 #include "chrome/common/chrome_paths.h" 32 #include "chrome/common/chrome_paths.h"
33 #include "chrome/common/chrome_switches.h" 33 #include "chrome/common/chrome_switches.h"
34 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
35 #include "chromeos/chromeos_switches.h"
35 #include "chromeos/dbus/dbus_thread_manager.h" 36 #include "chromeos/dbus/dbus_thread_manager.h"
36 #include "content/public/browser/browser_thread.h" 37 #include "content/public/browser/browser_thread.h"
37 #include "content/public/browser/notification_service.h" 38 #include "content/public/browser/notification_service.h"
38 #include "ui/base/resource/resource_bundle.h" 39 #include "ui/base/resource/resource_bundle.h"
39 #include "ui/gfx/codec/jpeg_codec.h" 40 #include "ui/gfx/codec/jpeg_codec.h"
40 #include "ui/gfx/image/image_skia_operations.h" 41 #include "ui/gfx/image/image_skia_operations.h"
41 #include "ui/gfx/skia_util.h" 42 #include "ui/gfx/skia_util.h"
42 43
43 using content::BrowserThread; 44 using content::BrowserThread;
44 45
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 } 247 }
247 248
248 return GetUserWallpaperInfo(UserManager::Get()->GetLoggedInUser()->email(), 249 return GetUserWallpaperInfo(UserManager::Get()->GetLoggedInUser()->email(),
249 info); 250 info);
250 } 251 }
251 252
252 void WallpaperManager::InitializeWallpaper() { 253 void WallpaperManager::InitializeWallpaper() {
253 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 254 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
254 UserManager* user_manager = UserManager::Get(); 255 UserManager* user_manager = UserManager::Get();
255 256
256 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) 257 if (CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType))
257 WizardController::SetZeroDelays(); 258 WizardController::SetZeroDelays();
258 259
259 // Zero delays is also set in autotests. 260 // Zero delays is also set in autotests.
260 if (WizardController::IsZeroDelayEnabled()) { 261 if (WizardController::IsZeroDelayEnabled()) {
261 // Ensure tests have some sort of wallpaper. 262 // Ensure tests have some sort of wallpaper.
262 ash::Shell::GetInstance()->desktop_background_controller()-> 263 ash::Shell::GetInstance()->desktop_background_controller()->
263 CreateEmptyWallpaper(); 264 CreateEmptyWallpaper();
264 return; 265 return;
265 } 266 }
266 267
(...skipping 840 matching lines...) Expand 10 before | Expand all | Expand 10 after
1107 1108
1108 void WallpaperManager::SystemResumed(const base::TimeDelta& sleep_duration) { 1109 void WallpaperManager::SystemResumed(const base::TimeDelta& sleep_duration) {
1109 BatchUpdateWallpaper(); 1110 BatchUpdateWallpaper();
1110 } 1111 }
1111 1112
1112 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) { 1113 void WallpaperManager::TimezoneChanged(const icu::TimeZone& timezone) {
1113 RestartTimer(); 1114 RestartTimer();
1114 } 1115 }
1115 1116
1116 } // chromeos 1117 } // chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698