[Media Galleries] Lazily initialize the storage monitor.

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/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/generated_resources.h"
 
 namespace options {
 
 using chrome::MediaGalleriesPreferences;
 using chrome::MediaGalleriesPrefInfoMap;
 using chrome::MediaGalleryPrefInfo;
 
-MediaGalleriesHandler::MediaGalleriesHandler() {
+MediaGalleriesHandler::MediaGalleriesHandler()
+    : weak_ptr_factory_(this) {
 }
 
 MediaGalleriesHandler::~MediaGalleriesHandler() {
   if (select_file_dialog_.get())
     select_file_dialog_->ListenerDestroyed();
 }
 
 void MediaGalleriesHandler::GetLocalizedValues(DictionaryValue* values) {
   DCHECK(values);
 
@@ skipping 10 matching lines @@
 
 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,
         base::Bind(&MediaGalleriesHandler::OnGalleriesChanged,

[vandebo (ex-Chrome), 2013/05/31 18:05:03]

This registration effectively assumes that StorageMonitor is already up and
running.... I think we need to init StorageMonitor just a bit earlier for
MediaGalleriesHandler.

[Greg Billock, 2013/06/01 01:48:46]

Yeah, I think you're right. This isn't specifically bound to the prefs
currently, so it just won't get notifications until the thing is initialized
later, but we're going to move to directly observing it, in which case we'll
want the initialization before that.

Also, the RegisterMessages needs similar treatment. The calls to InitializePage
and RegisterMessages are coming in through JS-initiated calls, both async, so
while I suspect we are unlikely ever to get one before InitializePage, I think
it's best to be defensive here while we're thinking carefully about it.

                    base::Unretained(this)));
   }
 
+  // Note: this call will set up the StorageMonitor.
+  // That is needed not only to populate the initial page contents,
+  // but also to hook the preferences up to device notifications so
+  // the change listener receives events.
   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() {
+  chrome::StorageMonitor::GetInstance()->Initialize(
+      base::Bind(&MediaGalleriesHandler::OnStorageMonitorInitialized,
+                 weak_ptr_factory_.GetWeakPtr()));
+}
+
+void MediaGalleriesHandler::OnStorageMonitorInitialized() {
   Profile* profile = Profile::FromWebUI(web_ui());
   chrome::MediaGalleriesPreferences* preferences =
       g_browser_process->media_file_system_registry()->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)
@@ skipping 27 matching lines @@
 
 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::MediaGalleriesPreferences* preferences =
       g_browser_process->media_file_system_registry()->GetPreferences(
           Profile::FromWebUI(web_ui()));
-  prefs->ForgetGalleryById(id);
+  preferences->ForgetGalleryById(id);
 }
 
 void MediaGalleriesHandler::FileSelected(const base::FilePath& path,
                                          int index,
                                          void* params) {
-  chrome::MediaGalleriesPreferences* prefs =
+  chrome::MediaGalleriesPreferences* preferences =
       g_browser_process->media_file_system_registry()->GetPreferences(
           Profile::FromWebUI(web_ui()));
-  prefs->AddGalleryByPath(path);
+  preferences->AddGalleryByPath(path);
 }
 
 }  // namespace options