MD Settings: Update some Settings handlers to use new JS lifecycle management.

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 "ash/audio/sounds.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 62 matching lines @@
 
 // Time histogram suffix for profile image download.
 const char kProfileDownloadReason[] = "Preferences";
 
 }  // namespace
 
 ChangePictureHandler::ChangePictureHandler()
     : previous_image_url_(url::kAboutBlankURL),
       previous_image_index_(user_manager::User::USER_IMAGE_INVALID),
       camera_observer_(this) {
-  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());
-
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   media::SoundsManager* manager = media::SoundsManager::Get();
   manager->Initialize(SOUND_OBJECT_DELETE,
                       bundle.GetRawDataResource(IDR_SOUND_OBJECT_DELETE_WAV));
   manager->Initialize(SOUND_CAMERA_SNAP,
                       bundle.GetRawDataResource(IDR_SOUND_CAMERA_SNAP_WAV));
 }
 
 ChangePictureHandler::~ChangePictureHandler() {
   if (select_file_dialog_.get())
@@ skipping 12 matching lines @@
                                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "onChangePicturePageInitialized",
       base::Bind(&ChangePictureHandler::HandlePageInitialized,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "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());
+}
+
+void ChangePictureHandler::OnJavascriptDisallowed() {
+  registrar_.RemoveAll();
+}
+
 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",
                           l10n_util::GetStringUTF16(
                               default_user_image::kDefaultImageAuthorIDs[i]));
     image_data->SetString("website",
                           l10n_util::GetStringUTF16(
                               default_user_image::kDefaultImageWebsiteIDs[i]));
     image_data->SetString("title",
                           default_user_image::GetDefaultImageDescription(i));
     image_urls.Append(image_data.release());
   }
-  web_ui()->CallJavascriptFunction("cr.webUIListenerCallback",
-                                   base::StringValue("default-images-changed"),
-                                   image_urls);
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::StringValue("default-images-changed"),
+                         image_urls);
 }
 
 void ChangePictureHandler::HandleChooseFile(const base::ListValue* args) {
   DCHECK(args && args->empty());
   select_file_dialog_ = ui::SelectFileDialog::Create(
       this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
 
   base::FilePath downloads_path;
   if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path)) {
     NOTREACHED();
@@ skipping 32 matching lines @@
   user_photo_ = gfx::ImageSkia();
   user_photo_data_url_ = image_url;
 
   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);
 
   SendDefaultImages();
   SendSelectedImage();
   UpdateProfileImage();
 }
 
 void ChangePictureHandler::SendSelectedImage() {
@@ skipping 14 matching lines @@
       break;
     }
     default: {
       DCHECK(previous_image_index_ >= 0 &&
              previous_image_index_ < default_user_image::kDefaultImagesCount);
       if (previous_image_index_ >=
           default_user_image::kFirstDefaultImageIndex) {
         // User has image from the current set of default images.
         base::StringValue image_url(
             default_user_image::GetDefaultImageUrl(previous_image_index_));
-        web_ui()->CallJavascriptFunction(
-            "cr.webUIListenerCallback",
-            base::StringValue("selected-image-changed"), image_url);
+        CallJavascriptFunction("cr.webUIListenerCallback",
+                               base::StringValue("selected-image-changed"),
+                               image_url);
       } else {
         // User has an old default image, so present it in the same manner as a
         // previous image from file.
         SendOldImage(
             default_user_image::GetDefaultImageUrl(previous_image_index_));
       }
     }
   }
 }
 
 void ChangePictureHandler::SendProfileImage(const gfx::ImageSkia& image,
                                             bool should_select) {
   base::StringValue data_url(webui::GetBitmapDataUrl(*image.bitmap()));
   base::FundamentalValue select(should_select);
-  web_ui()->CallJavascriptFunction("cr.webUIListenerCallback",
-                                   base::StringValue("profile-image-changed"),
-                                   data_url, select);
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::StringValue("profile-image-changed"), data_url,
+                         select);
 }
 
 void ChangePictureHandler::UpdateProfileImage() {
   UserImageManager* user_image_manager =
       ChromeUserManager::Get()->GetUserImageManager(GetUser()->GetAccountId());
   // If we have a downloaded profile image and haven't sent it in
   // |SendSelectedImage|, send it now (without selecting).
   if (previous_image_index_ != user_manager::User::USER_IMAGE_PROFILE &&
       !user_image_manager->DownloadedProfileImage().isNull())
     SendProfileImage(user_image_manager->DownloadedProfileImage(), false);
 
   user_image_manager->DownloadProfileImage(kProfileDownloadReason);
 }
 
 void ChangePictureHandler::SendOldImage(const std::string& image_url) {
   previous_image_url_ = image_url;
   base::StringValue url(image_url);
-  web_ui()->CallJavascriptFunction("cr.webUIListenerCallback",
-                                   base::StringValue("old-image-changed"), url);
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::StringValue("old-image-changed"), url);
 }
 
 void ChangePictureHandler::HandleSelectImage(const base::ListValue* args) {
   std::string image_url;
   std::string image_type;
   if (!args || args->GetSize() != 2 || !args->GetString(0, &image_url) ||
       !args->GetString(1, &image_type)) {
     NOTREACHED();
     return;
   }
@@ skipping 73 matching lines @@
   ChromeUserManager::Get()
       ->GetUserImageManager(GetUser()->GetAccountId())
       ->SaveUserImage(user_manager::UserImage::CreateAndEncode(photo));
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                             default_user_image::kHistogramImageFromCamera,
                             default_user_image::kHistogramImagesCount);
   VLOG(1) << "Selected camera photo";
 }
 
 void ChangePictureHandler::SetCameraPresent(bool present) {
-  web_ui()->CallJavascriptFunction("cr.webUIListenerCallback",
-                                   base::StringValue("camera-presence-changed"),
-                                   base::FundamentalValue(present));
+  CallJavascriptFunction("cr.webUIListenerCallback",
+                         base::StringValue("camera-presence-changed"),
+                         base::FundamentalValue(present));
 }
 
 void ChangePictureHandler::OnCameraPresenceCheckDone(bool is_camera_present) {
   SetCameraPresent(is_camera_present);
 }
 
 void ChangePictureHandler::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ skipping 28 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