Upstream version 5.34.104.0

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

diff --git a/src/chrome/browser/extensions/chrome_extensions_browser_client.h b/src/chrome/browser/extensions/chrome_extensions_browser_client.h
index 4552699..d74c1cd 100644 (file)
--- a/src/chrome/browser/extensions/chrome_extensions_browser_client.h
+++ b/src/chrome/browser/extensions/chrome_extensions_browser_client.h
@@ -44,6 +44,13 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
       content::BrowserContext* context) OVERRIDE;
   virtual content::BrowserContext* GetOriginalContext(
       content::BrowserContext* context) OVERRIDE;
+  virtual bool IsGuestSession(content::BrowserContext* context) OVERRIDE;
+  virtual bool IsExtensionIncognitoEnabled(
+      const std::string& extension_id,
+      content::BrowserContext* context) const OVERRIDE;
+  virtual bool CanExtensionCrossIncognito(
+      const extensions::Extension* extension,
+      content::BrowserContext* context) const OVERRIDE;
   virtual PrefService* GetPrefServiceForContext(
       content::BrowserContext* context) OVERRIDE;
   virtual bool DeferLoadingBackgroundHosts(
@@ -52,15 +59,16 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
       content::BrowserContext* context) const OVERRIDE;
   virtual void OnExtensionHostCreated(content::WebContents* web_contents)
       OVERRIDE;
+  virtual void OnRenderViewCreatedForBackgroundPage(ExtensionHost* host)
+      OVERRIDE;
   virtual bool DidVersionUpdate(content::BrowserContext* context) OVERRIDE;
   virtual scoped_ptr<AppSorting> CreateAppSorting() OVERRIDE;
   virtual bool IsRunningInForcedAppMode() OVERRIDE;
   virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager()
       OVERRIDE;
-  virtual std::vector<BrowserContextKeyedServiceFactory*>
-      GetExtensionSystemDependencies() OVERRIDE;
-  virtual ExtensionSystem* CreateExtensionSystem(
+  virtual ApiActivityMonitor* GetApiActivityMonitor(
       content::BrowserContext* context) OVERRIDE;
+  virtual ExtensionSystemProvider* GetExtensionSystemFactory() OVERRIDE;
 
  private:
   friend struct base::DefaultLazyInstanceTraits<ChromeExtensionsBrowserClient>;