[MD Settings][People] Fixes take picture button disappearing on page refresh

chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 103 matching lines @@
       "selectImage", base::Bind(&ChangePictureHandler::HandleSelectImage,
                                 base::Unretained(this)));
 }
 
 void ChangePictureHandler::OnJavascriptAllowed() {
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_IMAGE_UPDATED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_IMAGE_UPDATE_FAILED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                  content::NotificationService::AllSources());

[Dan Beam, 2016/11/04 22:57:38]

nit: start observing here

[Moe, 2016/11/07 14:48:45]

Done.

 }
 
 void ChangePictureHandler::OnJavascriptDisallowed() {
   registrar_.RemoveAll();

[Dan Beam, 2016/11/04 22:57:38]

nit: stop observing here

[Moe, 2016/11/07 14:48:45]

Done.

 }
 
 void ChangePictureHandler::SendDefaultImages() {
   base::ListValue image_urls;
   for (int i = default_user_image::kFirstDefaultImageIndex;
        i < default_user_image::kDefaultImagesCount; ++i) {
     std::unique_ptr<base::DictionaryValue> image_data(
         new base::DictionaryValue);
     image_data->SetString("url", default_user_image::GetDefaultImageUrl(i));
     image_data->SetString("author",
@@ skipping 59 matching lines @@
   ImageDecoder::Cancel(this);
   ImageDecoder::Start(this, raw_data);
 }
 
 void ChangePictureHandler::HandlePageInitialized(const base::ListValue* args) {
   DCHECK(args && args->empty());
 
   AllowJavascript();
 
   CameraPresenceNotifier* camera = CameraPresenceNotifier::GetInstance();
-  if (!camera_observer_.IsObserving(camera))
-    camera_observer_.Add(camera);
+  if (camera_observer_.IsObserving(camera)) {
+    // If already observing CameraPresenceNotifier (can happen when refreshing
+    // the page), we need to stop observing it, then re-observe it so that
+    // ChangePictureHandler::OnCameraPresenceCheckDone() gets called again.
+    camera_observer_.Remove(camera);
+  }
+  camera_observer_.Add(camera);
 
   SendDefaultImages();
   SendSelectedImage();
   UpdateProfileImage();
 }
 
 void ChangePictureHandler::SendSelectedImage() {
   const user_manager::User* user = GetUser();
   DCHECK(user->GetAccountId().is_valid());
 
@@ skipping 194 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui());
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile);
   if (!user)
     return user_manager::UserManager::Get()->GetActiveUser();
   return user;
 }
 
 }  // namespace settings
 }  // namespace chromeos