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

Unified Diff: chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc

Issue 2603423002: cros: Fix user image change crash (Closed)
Patch Set: rebase Created 3 years, 12 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
Index: chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
index 4290d407de93ad3c3ca38b71c831244e4eb2158a..36a33031d53da16f506e6a93ec4467ce50e392b8 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
@@ -82,6 +82,7 @@ const char kProfileDownloadReason[] = "Preferences";
ChangePictureHandler::ChangePictureHandler()
: previous_image_url_(url::kAboutBlankURL),
previous_image_index_(user_manager::User::USER_IMAGE_INVALID),
+ user_manager_observer_(this),
camera_observer_(this) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
media::SoundsManager* manager = media::SoundsManager::Get();
@@ -116,14 +117,12 @@ void ChangePictureHandler::RegisterMessages() {
}
void ChangePictureHandler::OnJavascriptAllowed() {
- user_manager::UserManager::Get()->AddObserver(this);
-
+ user_manager_observer_.Add(user_manager::UserManager::Get());
camera_observer_.Add(CameraPresenceNotifier::GetInstance());
}
void ChangePictureHandler::OnJavascriptDisallowed() {
- user_manager::UserManager::Get()->RemoveObserver(this);
-
+ user_manager_observer_.Remove(user_manager::UserManager::Get());
camera_observer_.Remove(CameraPresenceNotifier::GetInstance());
}

Powered by Google App Engine
This is Rietveld 408576698