| Index: chrome/browser/extensions/api/media_galleries/media_galleries_api.h
|
| diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
|
| index 86d2924caa8a33df08581d8a9679c4a5575fe0f6..fea564e9e509b1d72d1b2fd8e413757058dac231 100644
|
| --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
|
| +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.h
|
| @@ -14,12 +14,12 @@
|
| #include "base/callback_forward.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| -#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
|
| #include "chrome/browser/extensions/chrome_extension_function.h"
|
| #include "chrome/browser/media_galleries/media_file_system_registry.h"
|
| #include "chrome/browser/media_galleries/media_scan_manager_observer.h"
|
| #include "chrome/common/extensions/api/media_galleries.h"
|
| #include "components/storage_monitor/media_storage_util.h"
|
| +#include "extensions/browser/browser_context_keyed_api_factory.h"
|
|
|
| namespace MediaGalleries = extensions::api::media_galleries;
|
|
|
| @@ -39,15 +39,15 @@ class Extension;
|
|
|
| // The profile-keyed service that manages the media galleries extension API.
|
| // Created at the same time as the Profile. This is also the event router.
|
| -class MediaGalleriesEventRouter : public ProfileKeyedAPI,
|
| +class MediaGalleriesEventRouter : public BrowserContextKeyedAPI,
|
| public MediaScanManagerObserver {
|
| public:
|
| // BrowserContextKeyedService implementation.
|
| virtual void Shutdown() OVERRIDE;
|
|
|
| - // ProfileKeyedAPI implementation.
|
| - static ProfileKeyedAPIFactory<MediaGalleriesEventRouter>*
|
| - GetFactoryInstance();
|
| + // BrowserContextKeyedAPI implementation.
|
| + static BrowserContextKeyedAPIFactory<MediaGalleriesEventRouter>*
|
| + GetFactoryInstance();
|
|
|
| // Convenience method to get the MediaGalleriesAPI for a profile.
|
| static MediaGalleriesEventRouter* Get(content::BrowserContext* context);
|
| @@ -64,7 +64,7 @@ class MediaGalleriesEventRouter : public ProfileKeyedAPI,
|
| virtual void OnScanError(const std::string& extension_id) OVERRIDE;
|
|
|
| private:
|
| - friend class ProfileKeyedAPIFactory<MediaGalleriesEventRouter>;
|
| + friend class BrowserContextKeyedAPIFactory<MediaGalleriesEventRouter>;
|
|
|
| void DispatchEventToExtension(const std::string& extension_id,
|
| const std::string& event_name,
|
| @@ -73,7 +73,7 @@ class MediaGalleriesEventRouter : public ProfileKeyedAPI,
|
| explicit MediaGalleriesEventRouter(content::BrowserContext* context);
|
| virtual ~MediaGalleriesEventRouter();
|
|
|
| - // ProfileKeyedAPI implementation.
|
| + // BrowserContextKeyedAPI implementation.
|
| static const char* service_name() {
|
| return "MediaGalleriesAPI";
|
| }
|
|
|