| Index: chrome/browser/chrome_content_browser_client.h
|
| diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
|
| index 6de30f3812e8e821e540878e1ec6e3f9afb0d9dc..2e2b812535e92221cec9f1a2cd5814cf46730129 100644
|
| --- a/chrome/browser/chrome_content_browser_client.h
|
| +++ b/chrome/browser/chrome_content_browser_client.h
|
| @@ -21,9 +21,10 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| virtual void PluginProcessHostCreated(PluginProcessHost* host) OVERRIDE;
|
| virtual void WorkerProcessHostCreated(WorkerProcessHost* host) OVERRIDE;
|
| virtual content::WebUIFactory* GetWebUIFactory() OVERRIDE;
|
| - virtual bool ShouldUseProcessPerSite(Profile* profile,
|
| + virtual bool ShouldUseProcessPerSite(content::BrowserContext* browser_context,
|
| const GURL& effective_url) OVERRIDE;
|
| - virtual GURL GetEffectiveURL(Profile* profile, const GURL& url) OVERRIDE;
|
| + virtual GURL GetEffectiveURL(content::BrowserContext* browser_context,
|
| + const GURL& url) OVERRIDE;
|
| virtual bool IsURLSameAsAnySiteInstance(const GURL& url) OVERRIDE;
|
| virtual std::string GetCanonicalEncodingNameByAliasName(
|
| const std::string& alias_name) OVERRIDE;
|
| @@ -96,8 +97,9 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| virtual DevToolsManager* GetDevToolsManager() OVERRIDE;
|
| virtual net::NetLog* GetNetLog() OVERRIDE;
|
| virtual bool IsFastShutdownPossible() OVERRIDE;
|
| - virtual WebPreferences GetWebkitPrefs(Profile* profile,
|
| - bool is_web_ui) OVERRIDE;
|
| + virtual WebPreferences GetWebkitPrefs(
|
| + content::BrowserContext* browser_context,
|
| + bool is_web_ui) OVERRIDE;
|
| virtual void UpdateInspectorSetting(RenderViewHost* rvh,
|
| const std::string& key,
|
| const std::string& value) OVERRIDE;
|
|
|