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

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

Issue 1355063004: Template methods on Timer classes instead of the classes themselves. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: timer: fixcaller Created 5 years, 2 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/users/wallpaper/wallpaper_manager.h" 5 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
6 6
7 #include <numeric> 7 #include <numeric>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_constants.h" 10 #include "ash/ash_constants.h"
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 wallpaper::WallpaperInfo info_; 258 wallpaper::WallpaperInfo info_;
259 gfx::ImageSkia user_wallpaper_; 259 gfx::ImageSkia user_wallpaper_;
260 base::FilePath wallpaper_path_; 260 base::FilePath wallpaper_path_;
261 261
262 // Load default wallpaper instead of user image. 262 // Load default wallpaper instead of user image.
263 bool default_; 263 bool default_;
264 264
265 // This is "on destroy" callback that will call OnWallpaperSet() when 265 // This is "on destroy" callback that will call OnWallpaperSet() when
266 // image will be loaded. 266 // image will be loaded.
267 wallpaper::MovableOnDestroyCallbackHolder on_finish_; 267 wallpaper::MovableOnDestroyCallbackHolder on_finish_;
268 base::OneShotTimer<WallpaperManager::PendingWallpaper> timer; 268 base::OneShotTimer timer;
269 269
270 // Load start time to calculate duration. 270 // Load start time to calculate duration.
271 base::Time started_load_at_; 271 base::Time started_load_at_;
272 272
273 DISALLOW_COPY_AND_ASSIGN(PendingWallpaper); 273 DISALLOW_COPY_AND_ASSIGN(PendingWallpaper);
274 }; 274 };
275 275
276 // WallpaperManager, public: --------------------------------------------------- 276 // WallpaperManager, public: ---------------------------------------------------
277 277
278 WallpaperManager::~WallpaperManager() { 278 WallpaperManager::~WallpaperManager() {
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 } 1030 }
1031 } 1031 }
1032 1032
1033 if (need_update_screen) { 1033 if (need_update_screen) {
1034 DoSetDefaultWallpaper(std::string(), 1034 DoSetDefaultWallpaper(std::string(),
1035 MovableOnDestroyCallbackHolder().Pass()); 1035 MovableOnDestroyCallbackHolder().Pass());
1036 } 1036 }
1037 } 1037 }
1038 1038
1039 } // namespace chromeos 1039 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698