Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / extension_system_impl.h

diff --git a/src/chrome/browser/extensions/extension_system_impl.h b/src/chrome/browser/extensions/extension_system_impl.h
index 9a6ce20..bb2a21e 100644 (file)
--- a/src/chrome/browser/extensions/extension_system_impl.h
+++ b/src/chrome/browser/extensions/extension_system_impl.h
@@ -16,7 +16,6 @@ namespace extensions {
 class ContentVerifier;
 class DeclarativeUserScriptMaster;
 class ExtensionSystemSharedFactory;
-class ExtensionWarningBadgeService;
 class NavigationObserver;
 class SharedUserScriptMaster;
 class StateStoreNotificationObserver;
@@ -29,46 +28,41 @@ class StateStoreNotificationObserver;
 class ExtensionSystemImpl : public ExtensionSystem {
  public:
   explicit ExtensionSystemImpl(Profile* profile);
-  virtual ~ExtensionSystemImpl();
+  ~ExtensionSystemImpl() override;
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  void Shutdown() override;
 
-  virtual void InitForRegularProfile(bool extensions_enabled) OVERRIDE;
+  void InitForRegularProfile(bool extensions_enabled) override;
 
-  virtual ExtensionService* extension_service() OVERRIDE;  // shared
-  virtual RuntimeData* runtime_data() OVERRIDE;  // shared
-  virtual ManagementPolicy* management_policy() OVERRIDE;  // shared
+  ExtensionService* extension_service() override;  // shared
+  RuntimeData* runtime_data() override;            // shared
+  ManagementPolicy* management_policy() override;  // shared
   // shared
-  virtual SharedUserScriptMaster* shared_user_script_master() OVERRIDE;
-  virtual ProcessManager* process_manager() OVERRIDE;
-  virtual StateStore* state_store() OVERRIDE;  // shared
-  virtual StateStore* rules_store() OVERRIDE;  // shared
-  virtual LazyBackgroundTaskQueue* lazy_background_task_queue()
-      OVERRIDE;  // shared
-  virtual InfoMap* info_map() OVERRIDE; // shared
-  virtual EventRouter* event_router() OVERRIDE;  // shared
-  virtual WarningService* warning_service() OVERRIDE;
-  virtual Blacklist* blacklist() OVERRIDE;  // shared
-  virtual ErrorConsole* error_console() OVERRIDE;
-  virtual InstallVerifier* install_verifier() OVERRIDE;
-  virtual QuotaService* quota_service() OVERRIDE;  // shared
-
-  virtual void RegisterExtensionWithRequestContexts(
-      const Extension* extension) OVERRIDE;
-
-  virtual void UnregisterExtensionWithRequestContexts(
+  SharedUserScriptMaster* shared_user_script_master() override;
+  StateStore* state_store() override;                              // shared
+  StateStore* rules_store() override;                              // shared
+  LazyBackgroundTaskQueue* lazy_background_task_queue() override;  // shared
+  InfoMap* info_map() override;                                    // shared
+  EventRouter* event_router() override;                            // shared
+  ErrorConsole* error_console() override;
+  InstallVerifier* install_verifier() override;
+  QuotaService* quota_service() override;  // shared
+
+  void RegisterExtensionWithRequestContexts(
+      const Extension* extension) override;
+
+  void UnregisterExtensionWithRequestContexts(
       const std::string& extension_id,
-      const UnloadedExtensionInfo::Reason reason) OVERRIDE;
+      const UnloadedExtensionInfo::Reason reason) override;
 
-  virtual const OneShotEvent& ready() const OVERRIDE;
-  virtual ContentVerifier* content_verifier() OVERRIDE;  // shared
-  virtual scoped_ptr<ExtensionSet> GetDependentExtensions(
-      const Extension* extension) OVERRIDE;
+  const OneShotEvent& ready() const override;
+  ContentVerifier* content_verifier() override;  // shared
+  scoped_ptr<ExtensionSet> GetDependentExtensions(
+      const Extension* extension) override;
 
-  virtual DeclarativeUserScriptMaster*
-      GetDeclarativeUserScriptMasterByExtension(
-          const ExtensionId& extension_id) OVERRIDE;  // shared
+  DeclarativeUserScriptMaster* GetDeclarativeUserScriptMasterByExtension(
+      const ExtensionId& extension_id) override;  // shared
 
  private:
   friend class ExtensionSystemSharedFactory;
@@ -78,7 +72,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
   class Shared : public KeyedService {
    public:
     explicit Shared(Profile* profile);
-    virtual ~Shared();
+    ~Shared() override;
 
     // Initialization takes place in phases.
     virtual void InitPrefs();
@@ -87,7 +81,7 @@ class ExtensionSystemImpl : public ExtensionSystem {
     void Init(bool extensions_enabled);
 
     // KeyedService implementation.
-    virtual void Shutdown() OVERRIDE;
+    void Shutdown() override;
 
     StateStore* state_store();
     StateStore* rules_store();
@@ -95,11 +89,9 @@ class ExtensionSystemImpl : public ExtensionSystem {
     RuntimeData* runtime_data();
     ManagementPolicy* management_policy();
     SharedUserScriptMaster* shared_user_script_master();
-    Blacklist* blacklist();
     InfoMap* info_map();
     LazyBackgroundTaskQueue* lazy_background_task_queue();
     EventRouter* event_router();
-    WarningService* warning_service();
     ErrorConsole* error_console();
     InstallVerifier* install_verifier();
     QuotaService* quota_service();
@@ -130,15 +122,12 @@ class ExtensionSystemImpl : public ExtensionSystem {
     // per extension. Managers are instantiated the first time the declarative
     // API is used by an extension to request content scripts.
     ScopedVector<DeclarativeUserScriptMaster> declarative_user_script_masters_;
-    scoped_ptr<Blacklist> blacklist_;
     scoped_ptr<RuntimeData> runtime_data_;
     // ExtensionService depends on StateStore, Blacklist and RuntimeData.
     scoped_ptr<ExtensionService> extension_service_;
     scoped_ptr<ManagementPolicy> management_policy_;
     // extension_info_map_ needs to outlive process_manager_.
     scoped_refptr<InfoMap> extension_info_map_;
-    scoped_ptr<WarningService> warning_service_;
-    scoped_ptr<ExtensionWarningBadgeService> extension_warning_badge_service_;
     scoped_ptr<ErrorConsole> error_console_;
     scoped_ptr<InstallVerifier> install_verifier_;
     scoped_ptr<QuotaService> quota_service_;
@@ -158,12 +147,6 @@ class ExtensionSystemImpl : public ExtensionSystem {
 
   Shared* shared_;
 
-  // |process_manager_| must be destroyed before the Profile's |io_data_|. While
-  // |process_manager_| still lives, we handle incoming resource requests from
-  // extension processes and those require access to the ResourceContext owned
-  // by |io_data_|.
-  scoped_ptr<ProcessManager> process_manager_;
-
   DISALLOW_COPY_AND_ASSIGN(ExtensionSystemImpl);
 };