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

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

Issue 331033002: Revert of Remove more unretained (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
index 2d75ccc4f187aac1594e47242c83a326d9675854..6b1bd991b00819aadb3266a2b37dcbc1ddf60af5 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
@@ -526,7 +526,7 @@
CrosSettings::Get()->AddSettingsObserver(
kAccountsPrefShowUserNamesOnSignIn,
base::Bind(&WallpaperManager::InitializeRegisteredDeviceWallpaper,
- weak_factory_.GetWeakPtr()));
+ base::Unretained(this)));
}
void WallpaperManager::EnsureLoggedInUserWallpaperLoaded() {
@@ -896,7 +896,7 @@
blocking_task_runner->PostTask(
FROM_HERE,
base::Bind(&WallpaperManager::SaveCustomWallpaper,
- weak_factory_.GetWeakPtr(),
+ base::Unretained(this),
user_id_hash,
base::FilePath(wallpaper_info.file),
wallpaper_info.layout,
@@ -1181,7 +1181,7 @@
task_runner_->PostTask(
FROM_HERE,
base::Bind(&WallpaperManager::GetCustomWallpaperInternal,
- weak_factory_.GetWeakPtr(),
+ base::Unretained(this),
user_id,
info,
wallpaper_path,
@@ -1401,7 +1401,7 @@
BrowserThread::UI,
FROM_HERE,
base::Bind(&WallpaperManager::MoveCustomWallpapersSuccess,
- weak_factory_.GetWeakPtr(),
+ base::Unretained(this),
user_id,
user_id_hash));
}
@@ -1433,7 +1433,7 @@
task_runner_->PostTask(
FROM_HERE,
base::Bind(&WallpaperManager::MoveCustomWallpapersOnWorker,
- weak_factory_.GetWeakPtr(),
+ base::Unretained(this),
logged_in_user->email(),
logged_in_user->username_hash()));
}
@@ -1469,14 +1469,14 @@
BrowserThread::PostTask(BrowserThread::UI,
FROM_HERE,
base::Bind(&WallpaperManager::DoSetDefaultWallpaper,
- weak_factory_.GetWeakPtr(),
+ base::Unretained(this),
user_id,
base::Passed(on_finish.Pass())));
} else {
BrowserThread::PostTask(BrowserThread::UI,
FROM_HERE,
base::Bind(&WallpaperManager::StartLoad,
- weak_factory_.GetWeakPtr(),
+ base::Unretained(this),
user_id,
info,
update_wallpaper,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698