[Media Galleries] Lazily initialize the storage monitor.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_GALLERIES_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_GALLERIES_HANDLER_H_
 
 #include "base/memory/ref_counted.h"
+#include "base/memory/weak_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
+#include "chrome/browser/media_galleries/media_galleries_preferences.h"

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

remove

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

Done.

 #include "chrome/browser/ui/webui/options/options_ui.h"
 #include "content/public/browser/notification_observer.h"
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 namespace options {
 
 // Handles messages related to adding or removing media galleries.
 class MediaGalleriesHandler : public OptionsPageUIHandler,
                               public ui::SelectFileDialog::Listener {
  public:
@@ skipping 13 matching lines @@
  private:
   // Handles the "addNewGallery" message (no arguments).
   void HandleAddNewGallery(const base::ListValue* args);
   // Handles "forgetGallery" message. The first and only argument is the id of
   // the gallery.
   void HandleForgetGallery(const base::ListValue* args);
 
   // Called when the list of known galleries has changed; updates the page.
   void OnGalleriesChanged();
 
+  // Bottom half of |OnGalleriesChanged| after async call to initialize
+  // StorageMonitor.
+  void OnStorageMonitorInitialized();
+
   PrefChangeRegistrar pref_change_registrar_;
 
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
 
+  base::WeakPtrFactory<MediaGalleriesHandler> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_MEDIA_GALLERIES_HANDLER_H_