Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / activity_log_private / activity_log_private_api.h

diff --git a/src/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h b/src/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h
index ff4318c..3df12f4 100644 (file)
--- a/src/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h
+++ b/src/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h
@@ -12,8 +12,8 @@
 #include "base/synchronization/lock.h"
 #include "chrome/browser/extensions/activity_log/activity_actions.h"
 #include "chrome/browser/extensions/activity_log/activity_log.h"
-#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/chrome_extension_function.h"
+#include "extensions/browser/browser_context_keyed_api_factory.h"
 #include "extensions/browser/event_router.h"
 
 namespace extensions {
@@ -21,15 +21,15 @@ namespace extensions {
 class ActivityLog;
 
 // Handles interactions between the Activity Log API and implementation.
-class ActivityLogAPI : public ProfileKeyedAPI,
+class ActivityLogAPI : public BrowserContextKeyedAPI,
                        public extensions::ActivityLog::Observer,
                        public EventRouter::Observer {
  public:
-  explicit ActivityLogAPI(Profile* profile);
+  explicit ActivityLogAPI(content::BrowserContext* context);
   virtual ~ActivityLogAPI();
 
-  // ProfileKeyedAPI implementation.
-  static ProfileKeyedAPIFactory<ActivityLogAPI>* GetFactoryInstance();
+  // BrowserContextKeyedAPI implementation.
+  static BrowserContextKeyedAPIFactory<ActivityLogAPI>* GetFactoryInstance();
 
   virtual void Shutdown() OVERRIDE;
 
@@ -37,7 +37,7 @@ class ActivityLogAPI : public ProfileKeyedAPI,
   static bool IsExtensionWhitelisted(const std::string& extension_id);
 
  private:
-  friend class ProfileKeyedAPIFactory<ActivityLogAPI>;
+  friend class BrowserContextKeyedAPIFactory<ActivityLogAPI>;
   static const char* service_name() { return "ActivityLogPrivateAPI"; }
 
   // ActivityLog::Observer
@@ -49,15 +49,16 @@ class ActivityLogAPI : public ProfileKeyedAPI,
   virtual void OnListenerAdded(const EventListenerInfo& details) OVERRIDE;
   virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE;
 
-  Profile* profile_;
+  content::BrowserContext* browser_context_;
   ActivityLog* activity_log_;
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(ActivityLogAPI);
 };
 
-template<>
-void ProfileKeyedAPIFactory<ActivityLogAPI>::DeclareFactoryDependencies();
+template <>
+void
+    BrowserContextKeyedAPIFactory<ActivityLogAPI>::DeclareFactoryDependencies();
 
 // The implementation of activityLogPrivate.getExtensionActivities
 class ActivityLogPrivateGetExtensionActivitiesFunction
@@ -70,7 +71,7 @@ class ActivityLogPrivateGetExtensionActivitiesFunction
   virtual ~ActivityLogPrivateGetExtensionActivitiesFunction() {}
 
   // ExtensionFunction:
-  virtual bool RunImpl() OVERRIDE;
+  virtual bool RunAsync() OVERRIDE;
 
  private:
   void OnLookupCompleted(
@@ -88,7 +89,7 @@ class ActivityLogPrivateDeleteActivitiesFunction
   virtual ~ActivityLogPrivateDeleteActivitiesFunction() {}
 
   // ExtensionFunction:
-  virtual bool RunImpl() OVERRIDE;
+  virtual bool RunAsync() OVERRIDE;
 };
 
 // The implementation of activityLogPrivate.deleteDatabase
@@ -102,7 +103,7 @@ class ActivityLogPrivateDeleteDatabaseFunction
   virtual ~ActivityLogPrivateDeleteDatabaseFunction() {}
 
   // ExtensionFunction:
-  virtual bool RunImpl() OVERRIDE;
+  virtual bool RunAsync() OVERRIDE;
 };
 
 // The implementation of activityLogPrivate.deleteUrls
@@ -116,7 +117,7 @@ class ActivityLogPrivateDeleteUrlsFunction
   virtual ~ActivityLogPrivateDeleteUrlsFunction() {}
 
   // ExtensionFunction:
-  virtual bool RunImpl() OVERRIDE;
+  virtual bool RunAsync() OVERRIDE;
 };
 
 }  // namespace extensions