content/browser/mock_content_browser_client.h - Issue 7464009: Removal of Profile from content part 1.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/mock_content_browser_client.h

Issue 7464009: Removal of Profile from content part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: works now Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/mock_content_browser_client.h

diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h

index bcbdc715471182adc851e25956649ac757e381cf..6db7c4937f17fcb1840bc300103876972c0c3717 100644

--- a/content/browser/mock_content_browser_client.h

+++ b/content/browser/mock_content_browser_client.h

@@ -23,7 +23,8 @@ class MockContentBrowserClient : public ContentBrowserClient {

virtual void PluginProcessHostCreated(PluginProcessHost* host) OVERRIDE;

virtual void WorkerProcessHostCreated(WorkerProcessHost* host) OVERRIDE;

virtual WebUIFactory* GetWebUIFactory() OVERRIDE;

- virtual GURL GetEffectiveURL(Profile* profile, const GURL& url) OVERRIDE;

+ virtual GURL GetEffectiveURL(content::BrowserContext* context,

+ const GURL& url) OVERRIDE;

virtual bool IsURLSameAsAnySiteInstance(const GURL& url) OVERRIDE;

virtual std::string GetCanonicalEncodingNameByAliasName(

const std::string& alias_name) OVERRIDE;

@@ -95,7 +96,7 @@ class MockContentBrowserClient : public ContentBrowserClient {

virtual MHTMLGenerationManager* GetMHTMLGenerationManager() OVERRIDE;

virtual DevToolsManager* GetDevToolsManager() OVERRIDE;

virtual bool IsFastShutdownPossible() OVERRIDE;

- virtual WebPreferences GetWebkitPrefs(Profile* profile,

+ virtual WebPreferences GetWebkitPrefs(content::BrowserContext* context,

bool is_web_ui) OVERRIDE;

virtual void UpdateInspectorSetting(RenderViewHost* rvh,

const std::string& key,