| 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 f83a8b2a6e546a2f56d090642e279be67872d2f2..f9b74b654da29c97bc358f79124e4760b836fa67 100644
|
| --- a/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
|
| +++ b/chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc
|
| @@ -122,10 +122,14 @@ void ChangePictureHandler::OnJavascriptAllowed() {
|
| content::NotificationService::AllSources());
|
| registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
|
| content::NotificationService::AllSources());
|
| +
|
| + camera_observer_.Add(CameraPresenceNotifier::GetInstance());
|
| }
|
|
|
| void ChangePictureHandler::OnJavascriptDisallowed() {
|
| registrar_.RemoveAll();
|
| +
|
| + camera_observer_.Remove(CameraPresenceNotifier::GetInstance());
|
| }
|
|
|
| void ChangePictureHandler::SendDefaultImages() {
|
| @@ -204,10 +208,6 @@ void ChangePictureHandler::HandlePageInitialized(const base::ListValue* args) {
|
|
|
| AllowJavascript();
|
|
|
| - CameraPresenceNotifier* camera = CameraPresenceNotifier::GetInstance();
|
| - if (!camera_observer_.IsObserving(camera))
|
| - camera_observer_.Add(camera);
|
| -
|
| SendDefaultImages();
|
| SendSelectedImage();
|
| UpdateProfileImage();
|
|
|