Remove PrefObserver usages, batch 13.

chrome/browser/ui/webui/options/media_galleries_handler.cc

 // Copyright (c) 2012 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/options/media_galleries_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/media_gallery/media_file_system_registry.h"
 #include "chrome/browser/media_gallery/media_galleries_preferences.h"
@@ skipping 34 matching lines @@
                 IDS_MEDIA_GALLERY_MANAGE_TITLE);
 }
 
 void MediaGalleriesHandler::InitializePage() {
   Profile* profile = Profile::FromWebUI(web_ui());
   if (!chrome::MediaGalleriesPreferences::APIHasBeenUsed(profile))
     return;
 
   if (pref_change_registrar_.IsEmpty()) {
     pref_change_registrar_.Init(profile->GetPrefs());
-    pref_change_registrar_.Add(prefs::kMediaGalleriesRememberedGalleries, this);
+    pref_change_registrar_.Add(
+        prefs::kMediaGalleriesRememberedGalleries,
+        base::Bind(&MediaGalleriesHandler::OnGalleriesChanged,
+                   base::Unretained(this)));
   }
 
   OnGalleriesChanged();
 }
 
 void MediaGalleriesHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback(
       "addNewGallery",
       base::Bind(&MediaGalleriesHandler::HandleAddNewGallery,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback(
       "forgetGallery",
       base::Bind(&MediaGalleriesHandler::HandleForgetGallery,
                  base::Unretained(this)));
 }
 
-void MediaGalleriesHandler::OnGalleriesChanged() {
-  Profile* profile = Profile::FromWebUI(web_ui());
-  chrome::MediaGalleriesPreferences* preferences =
-      chrome::MediaFileSystemRegistry::GetInstance()->GetPreferences(profile);
-
-  ListValue list;
-  const MediaGalleriesPrefInfoMap& galleries = preferences->known_galleries();
-  for (MediaGalleriesPrefInfoMap::const_iterator iter = galleries.begin();
-       iter != galleries.end(); ++iter) {
-    const MediaGalleryPrefInfo& gallery = iter->second;
-    if (gallery.type == MediaGalleryPrefInfo::kBlackListed)
-      continue;
-
-    DictionaryValue* dict = new DictionaryValue();
-    dict->SetString("displayName", gallery.display_name);
-    dict->SetString("path", gallery.AbsolutePath().LossyDisplayName());
-    dict->SetString("id", base::Uint64ToString(gallery.pref_id));
-    list.Append(dict);
-  }
-
-  web_ui()->CallJavascriptFunction(
-      "options.MediaGalleriesManager.setAvailableMediaGalleries", list);
-}
-
 void MediaGalleriesHandler::HandleAddNewGallery(const base::ListValue* args) {
   ui::SelectFileDialog* dialog = ui::SelectFileDialog::Create(
       this,
       new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
   dialog->SelectFile(ui::SelectFileDialog::SELECT_FOLDER,
                      string16(),  // TODO(estade): a name for the dialog?
                      FilePath(),
                      NULL, 0,
                      FilePath::StringType(),
                      web_ui()->GetWebContents()->GetView()->
                          GetTopLevelNativeWindow(),
                      NULL);
 }
 
 void MediaGalleriesHandler::HandleForgetGallery(const base::ListValue* args) {
   std::string string_id;
   uint64 id = 0;
   if (!args->GetString(0, &string_id) ||
       !base::StringToUint64(string_id, &id)) {
     NOTREACHED();
     return;
   }
 
   chrome::MediaGalleriesPreferences* prefs =
       chrome::MediaFileSystemRegistry::GetInstance()->GetPreferences(
           Profile::FromWebUI(web_ui()));
   prefs->ForgetGalleryById(id);
 }
 
-void MediaGalleriesHandler::FileSelected(
-    const FilePath& path, int index, void* params) {
+void MediaGalleriesHandler::FileSelected(const FilePath& path,
+                                         int index,
+                                         void* params) {
   chrome::MediaGalleriesPreferences* prefs =
       chrome::MediaFileSystemRegistry::GetInstance()->GetPreferences(
           Profile::FromWebUI(web_ui()));
   prefs->AddGalleryByPath(path);
 }
 
-void MediaGalleriesHandler::OnPreferenceChanged(PrefServiceBase* service,
-                                                const std::string& pref_name) {
-  DCHECK_EQ(std::string(prefs::kMediaGalleriesRememberedGalleries), pref_name);
-  OnGalleriesChanged();
+void MediaGalleriesHandler::OnGalleriesChanged() {

[Jói, 2012/11/21 13:37:45]

You've reordered methods here, which is OK, but in general when doing
refactoring changes I suggest not changing the order unless you find the .cc and
.h file orders already match before your change.

Reviewing the change when methods are reordered is slightly more difficult, as
the diff from the before and after versions of the methods are not as clear.

[tfarina, 2012/11/21 13:48:33]

Done.

+  Profile* profile = Profile::FromWebUI(web_ui());
+  chrome::MediaGalleriesPreferences* preferences =
+      chrome::MediaFileSystemRegistry::GetInstance()->GetPreferences(profile);
+
+  ListValue list;
+  const MediaGalleriesPrefInfoMap& galleries = preferences->known_galleries();
+  for (MediaGalleriesPrefInfoMap::const_iterator iter = galleries.begin();
+       iter != galleries.end(); ++iter) {
+    const MediaGalleryPrefInfo& gallery = iter->second;
+    if (gallery.type == MediaGalleryPrefInfo::kBlackListed)
+      continue;
+
+    DictionaryValue* dict = new DictionaryValue();
+    dict->SetString("displayName", gallery.display_name);
+    dict->SetString("path", gallery.AbsolutePath().LossyDisplayName());
+    dict->SetString("id", base::Uint64ToString(gallery.pref_id));
+    list.Append(dict);
+  }
+
+  web_ui()->CallJavascriptFunction(
+      "options.MediaGalleriesManager.setAvailableMediaGalleries", list);
 }
 
 }  // namespace options