content/browser/web_contents/web_contents_impl.h - Issue 10384128: Quote WebPreferences in namespace webkit_glue.

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/web_contents/web_contents_impl.h

Issue 10384128: Quote WebPreferences in namespace webkit_glue. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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/web_contents/web_contents_impl.h

diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h

index 934ad7a50463b22c8b8c717ebe9aae80efcf21e2..b21a95e47d8d46958a56a951f00901df680c7d41 100644

--- a/content/browser/web_contents/web_contents_impl.h

+++ b/content/browser/web_contents/web_contents_impl.h

@@ -70,7 +70,7 @@ class CONTENT_EXPORT WebContentsImpl

virtual ~WebContentsImpl();

// Returns the content specific prefs for the given RVH.

- static WebPreferences GetWebkitPrefs(

+ static webkit_glue::WebPreferences GetWebkitPrefs(

content::RenderViewHost* rvh, const GURL& url);

// Returns the SavePackage which manages the page saving job. May be NULL.

@@ -322,7 +322,7 @@ class CONTENT_EXPORT WebContentsImpl

IPC::Message* reply_msg) OVERRIDE;

virtual content::RendererPreferences GetRendererPrefs(

content::BrowserContext* browser_context) const OVERRIDE;

- virtual WebPreferences GetWebkitPrefs() OVERRIDE;

+ virtual webkit_glue::WebPreferences GetWebkitPrefs() OVERRIDE;

virtual void OnUserGesture() OVERRIDE;

virtual void OnIgnoredUIEvent() OVERRIDE;

virtual void RendererUnresponsive(content::RenderViewHost* render_view_host,