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

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

Issue 2568973002: chromeos: Replace user image notifications with observer (Closed)
Patch Set: rebase Created 4 years 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.h
diff --git a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h
index 382f09ebb68d6fdf42efc99507461e67cd6d237d..55e718bfbf1cb78ad84e835c5ca1a56dcf74435d 100644
--- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h
@@ -10,8 +10,7 @@
#include "chrome/browser/chromeos/camera_presence_notifier.h"
#include "chrome/browser/image_decoder.h"
#include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "components/user_manager/user_manager.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/shell_dialogs/select_file_dialog.h"
@@ -31,7 +30,7 @@ namespace settings {
// ChromeOS user image settings page UI handler.
class ChangePictureHandler : public ::settings::SettingsPageUIHandler,
public ui::SelectFileDialog::Listener,
- public content::NotificationObserver,
+ public user_manager::UserManager::Observer,
public ImageDecoder::ImageRequest,
public CameraPresenceNotifier::Observer {
public:
@@ -93,10 +92,10 @@ class ChangePictureHandler : public ::settings::SettingsPageUIHandler,
int index,
void* params) override;
- // content::NotificationObserver implementation.
- void Observe(int type,
- const content::NotificationSource& source,
- const content::NotificationDetails& details) override;
+ // user_manager::UserManager::Observer implementation.
+ void OnUserImageChanged(const user_manager::User& user) override;
+ void OnUserProfileImageUpdated(const user_manager::User& user,
+ const gfx::ImageSkia& profile_image) override;
// Sets user image to photo taken from camera.
void SetImageFromCamera(const gfx::ImageSkia& photo);
@@ -127,8 +126,6 @@ class ChangePictureHandler : public ::settings::SettingsPageUIHandler,
// Data URL for |user_photo_|.
std::string user_photo_data_url_;
- content::NotificationRegistrar registrar_;
-
ScopedObserver<CameraPresenceNotifier, ChangePictureHandler> camera_observer_;
DISALLOW_COPY_AND_ASSIGN(ChangePictureHandler);

Powered by Google App Engine
This is Rietveld 408576698