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

Side by Side Diff: components/wallpaper/wallpaper_manager_base.cc

Issue 1886653002: Remove WallpaperManager dependency on Cryptohome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix rebase (raw_salt_ is now properly set). Created 4 years, 8 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
« no previous file with comments | « components/wallpaper/wallpaper_manager_base.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "components/wallpaper/wallpaper_manager_base.h" 5 #include "components/wallpaper/wallpaper_manager_base.h"
6 6
7 #include <numeric> 7 #include <numeric>
8 #include <vector> 8 #include <vector>
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 } 857 }
858 858
859 void WallpaperManagerBase::MoveLoggedInUserCustomWallpaper() { 859 void WallpaperManagerBase::MoveLoggedInUserCustomWallpaper() {
860 DCHECK(thread_checker_.CalledOnValidThread()); 860 DCHECK(thread_checker_.CalledOnValidThread());
861 const user_manager::User* logged_in_user = 861 const user_manager::User* logged_in_user =
862 user_manager::UserManager::Get()->GetLoggedInUser(); 862 user_manager::UserManager::Get()->GetLoggedInUser();
863 if (logged_in_user) { 863 if (logged_in_user) {
864 task_runner_->PostTask( 864 task_runner_->PostTask(
865 FROM_HERE, 865 FROM_HERE,
866 base::Bind(&WallpaperManagerBase::MoveCustomWallpapersOnWorker, 866 base::Bind(&WallpaperManagerBase::MoveCustomWallpapersOnWorker,
867 logged_in_user->GetAccountId(), GetFilesId(*logged_in_user), 867 logged_in_user->GetAccountId(),
868 GetFilesId(logged_in_user->GetAccountId()),
868 base::ThreadTaskRunnerHandle::Get(), 869 base::ThreadTaskRunnerHandle::Get(),
869 weak_factory_.GetWeakPtr())); 870 weak_factory_.GetWeakPtr()));
870 } 871 }
871 } 872 }
872 873
873 void WallpaperManagerBase::SaveLastLoadTime(const base::TimeDelta elapsed) { 874 void WallpaperManagerBase::SaveLastLoadTime(const base::TimeDelta elapsed) {
874 while (last_load_times_.size() >= kLastLoadsStatsMsMaxSize) 875 while (last_load_times_.size() >= kLastLoadsStatsMsMaxSize)
875 last_load_times_.pop_front(); 876 last_load_times_.pop_front();
876 877
877 if (elapsed > base::TimeDelta::FromMicroseconds(0)) { 878 if (elapsed > base::TimeDelta::FromMicroseconds(0)) {
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1007 void WallpaperManagerBase::CreateSolidDefaultWallpaper() { 1008 void WallpaperManagerBase::CreateSolidDefaultWallpaper() {
1008 loaded_wallpapers_for_test_++; 1009 loaded_wallpapers_for_test_++;
1009 SkBitmap bitmap; 1010 SkBitmap bitmap;
1010 bitmap.allocN32Pixels(1, 1); 1011 bitmap.allocN32Pixels(1, 1);
1011 bitmap.eraseColor(kDefaultWallpaperColor); 1012 bitmap.eraseColor(kDefaultWallpaperColor);
1012 const gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap); 1013 const gfx::ImageSkia image = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
1013 default_wallpaper_image_.reset(new user_manager::UserImage(image)); 1014 default_wallpaper_image_.reset(new user_manager::UserImage(image));
1014 } 1015 }
1015 1016
1016 } // namespace wallpaper 1017 } // namespace wallpaper
OLDNEW
« no previous file with comments | « components/wallpaper/wallpaper_manager_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698