[Media Galleries] Lazily initialize the storage monitor.

chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.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_EXTENSIONS_API_MEDIA_GALLERIES_PRIVATE_MEDIA_GALLERIES_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_PRIVATE_MEDIA_GALLERIES_PRIVATE_API_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h"
 #include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/media_galleries/media_galleries_preferences.h"
 #include "chrome/browser/storage_monitor/storage_monitor.h"
 #include "chrome/common/extensions/api/media_galleries_private.h"
 
 class Profile;
 
 namespace extensions {
 
 class MediaGalleriesPrivateEventRouter;
 
 // The profile-keyed service that manages the media galleries private extension
-// API.
+// API. Created at the same time as the Profile.
 class MediaGalleriesPrivateAPI : public ProfileKeyedAPI,
                                  public EventRouter::Observer {
  public:
   explicit MediaGalleriesPrivateAPI(Profile* profile);
   virtual ~MediaGalleriesPrivateAPI();
 
   // BrowserContextKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
   // ProfileKeyedAPI implementation.
@@ skipping 40 matching lines @@
 
   // ProfileKeyedAPI implementation.
   static const char* service_name() {
     return "MediaGalleriesPrivateAPI";
   }
   static const bool kServiceIsNULLWhileTesting = true;
 
   // Current profile.
   Profile* profile_;
 
+  // Created lazily on first access.
   scoped_ptr<GalleryWatchStateTracker> tracker_;
 
   // Created lazily on first access.
   scoped_ptr<MediaGalleriesPrivateEventRouter>
       media_galleries_private_event_router_;
 
+  base::WeakPtrFactory<MediaGalleriesPrivateAPI> weak_ptr_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesPrivateAPI);
 };
 
 // Implements the chrome.mediaGalleriesPrivate.addGalleryWatch method.
 class MediaGalleriesPrivateAddGalleryWatchFunction
     : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("mediaGalleriesPrivate.addGalleryWatch",
                              MEDIAGALLERIESPRIVATE_ADDGALLERYWATCH);
 
  protected:
   virtual ~MediaGalleriesPrivateAddGalleryWatchFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
  private:
+  void OnStorageMonitorInit(const std::string& pref_id);
+
   // Gallery watch request handler.
   void HandleResponse(chrome::MediaGalleryPrefId gallery_id,
                       bool success);
 };
 
 // Implements the chrome.mediaGalleriesPrivate.removeGalleryWatch method.
 class MediaGalleriesPrivateRemoveGalleryWatchFunction
-    : public SyncExtensionFunction {
+    : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("mediaGalleriesPrivate.removeGalleryWatch",
                              MEDIAGALLERIESPRIVATE_REMOVEGALLERYWATCH);
 
  protected:
   virtual ~MediaGalleriesPrivateRemoveGalleryWatchFunction();
 
   // SyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
+
+ private:
+  void OnStorageMonitorInit(const std::string& pref_id);
 };
 
 // Implements the chrome.mediaGalleriesPrivate.getAllGalleryWatch method.
 class MediaGalleriesPrivateGetAllGalleryWatchFunction
-    : public SyncExtensionFunction {
+    : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("mediaGalleriesPrivate.getAllGalleryWatch",
                              MEDIAGALLERIESPRIVATE_GETALLGALLERYWATCH);
  protected:
   virtual ~MediaGalleriesPrivateGetAllGalleryWatchFunction();
 
   // SyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
+
+ private:
+  void OnStorageMonitorInit();
 };
 
 // Implements the chrome.mediaGalleriesPrivate.removeAllGalleryWatch method.
 class MediaGalleriesPrivateRemoveAllGalleryWatchFunction
     : public SyncExtensionFunction {

[Lei Zhang, 2013/06/03 06:01:35]

async

[Greg Billock, 2013/06/03 15:30:57]

Done.

  public:
   DECLARE_EXTENSION_FUNCTION("mediaGalleriesPrivate.removeAllGalleryWatch",
                              MEDIAGALLERIESPRIVATE_REMOVEALLGALLERYWATCH);
  protected:
   virtual ~MediaGalleriesPrivateRemoveAllGalleryWatchFunction();
 
   // SyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
+
+ private:
+  void OnStorageMonitorInit();
 };
 
 // Implements the chrome.mediaGalleriesPrivate.ejectDevice method.
 class MediaGalleriesPrivateEjectDeviceFunction
     : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("mediaGalleriesPrivate.ejectDevice",
                              MEDIAGALLERIESPRIVATE_EJECTDEVICE);
 
  protected:
   virtual ~MediaGalleriesPrivateEjectDeviceFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 
  private:
+  void OnStorageMonitorInit(const std::string& transient_device_id);
+
   // Eject device request handler.
   void HandleResponse(chrome::StorageMonitor::EjectStatus status);
 };
 
 // Implements the chrome.mediaGalleriesPrivate.getHandlers method.
 class MediaGalleriesPrivateGetHandlersFunction
     : public AsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("mediaGalleriesPrivate.getHandlers",
                              MEDIAGALLERIESPRIVATE_GETHANDLERS);
 
  protected:
   virtual ~MediaGalleriesPrivateGetHandlersFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunImpl() OVERRIDE;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_MEDIA_GALLERIES_PRIVATE_MEDIA_GALLERIES_PRIVATE_API_H_