[Media Galleries] Lazily initialize the storage monitor.

chrome/browser/media_galleries/media_galleries_dialog_controller.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/media_galleries/media_galleries_dialog_controller.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 80 matching lines @@
 }
 
 }  // namespace
 
 MediaGalleriesDialogController::MediaGalleriesDialogController(
     content::WebContents* web_contents,
     const Extension& extension,
     const base::Closure& on_finish)
       : web_contents_(web_contents),
         extension_(&extension),
-        on_finish_(on_finish) {
+        on_finish_(on_finish),
+        weak_ptr_factory_(this) {
+  StorageMonitor::GetInstance()->Initialize(base::Bind(
+      &MediaGalleriesDialogController::OnStorageMonitorInitialized,
+      weak_ptr_factory_.GetWeakPtr()));
+}
+
+void MediaGalleriesDialogController::OnStorageMonitorInitialized() {
   MediaFileSystemRegistry* registry =
       g_browser_process->media_file_system_registry();
   preferences_ = registry->GetPreferences(
-      Profile::FromBrowserContext(web_contents->GetBrowserContext()));
+      Profile::FromBrowserContext(web_contents_->GetBrowserContext()));
   InitializePermissions();
 
   dialog_.reset(MediaGalleriesDialog::Create(this));
 
   StorageMonitor* monitor = StorageMonitor::GetInstance();
   if (monitor)
     monitor->AddObserver(this);
 
   preferences_->AddGalleryChangeObserver(this);
 }
 
 MediaGalleriesDialogController::MediaGalleriesDialogController()
     : web_contents_(NULL),
       extension_(NULL),
-      preferences_(NULL) {}
+      preferences_(NULL),
+      weak_ptr_factory_(this) {}

[vandebo (ex-Chrome), 2013/05/22 21:40:34]

Controller is self owned (see media_galleries/media_galleries_api.cc:215) so we
don't need this.

[Greg Billock, 2013/05/23 00:55:59]

Done.

 
 MediaGalleriesDialogController::~MediaGalleriesDialogController() {
   StorageMonitor* monitor = StorageMonitor::GetInstance();
   if (monitor)
     monitor->RemoveObserver(this);
 
   if (select_folder_dialog_.get())
     select_folder_dialog_->ListenerDestroyed();
 }
 
@@ skipping 376 matching lines @@
     if (iter->pref_info.device_id == device_id)
       dialog_->UpdateGallery(iter->pref_info, iter->allowed);
   }
 }
 
 // MediaGalleries dialog -------------------------------------------------------
 
 MediaGalleriesDialog::~MediaGalleriesDialog() {}
 
 }  // namespace chrome