From 6717bf27e115a3745e0418688436139c58dac753 Mon Sep 17 00:00:00 2001 From: "wangxianzhu@chromium.org" Date: Fri, 11 May 2012 23:31:25 +0000 Subject: Quote WebPreferences in namespace webkit_glue. To avoid name conflict when linking DumpRenderTree which has its own implementation of the class with the same name. BUG=127811 TEST=Build all without errors TBR=kalman@chromium.org,dpapad@chromium.org,ben@chromium.org,battre@chromium.org Review URL: https://chromiumcodereview.appspot.com/10384128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136707 0039d316-1c4b-4281-b951-d872f2087c98 --- content/public/browser/content_browser_client.h | 5 ++++- content/public/browser/render_view_host.h | 6 +++++- content/public/browser/render_view_host_delegate.cc | 4 ++-- content/public/browser/render_view_host_delegate.h | 5 ++++- content/public/renderer/render_view.h | 4 +++- 5 files changed, 18 insertions(+), 6 deletions(-) (limited to 'content/public') diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index b390748..2c2f6ef 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -22,7 +22,10 @@ class GURL; class PluginProcessHost; class ResourceDispatcherHost; class SkBitmap; + +namespace webkit_glue { struct WebPreferences; +} namespace content { class AccessTokenStore; @@ -377,7 +380,7 @@ class ContentBrowserClient { // to the embedder to update it if it wants. virtual void OverrideWebkitPrefs(content::RenderViewHost* render_view_host, const GURL& url, - WebPreferences* prefs) = 0; + webkit_glue::WebPreferences* prefs) = 0; // Inspector setting was changed and should be persisted. virtual void UpdateInspectorSetting(content::RenderViewHost* rvh, diff --git a/content/public/browser/render_view_host.h b/content/public/browser/render_view_host.h index 991c868..0076281 100644 --- a/content/public/browser/render_view_host.h +++ b/content/public/browser/render_view_host.h @@ -16,7 +16,10 @@ class FilePath; class GURL; struct WebDropData; + +namespace webkit_glue { struct WebPreferences; +} namespace gfx { class Point; @@ -246,7 +249,8 @@ class CONTENT_EXPORT RenderViewHost : virtual public RenderWidgetHost { virtual void ToggleSpeechInput() = 0; // Passes a list of Webkit preferences to the renderer. - virtual void UpdateWebkitPreferences(const WebPreferences& prefs) = 0; + virtual void UpdateWebkitPreferences( + const webkit_glue::WebPreferences& prefs) = 0; }; } // namespace content diff --git a/content/public/browser/render_view_host_delegate.cc b/content/public/browser/render_view_host_delegate.cc index 82d0e30..50552fd 100644 --- a/content/public/browser/render_view_host_delegate.cc +++ b/content/public/browser/render_view_host_delegate.cc @@ -30,8 +30,8 @@ WebContents* RenderViewHostDelegate::GetAsWebContents() { return NULL; } -WebPreferences RenderViewHostDelegate::GetWebkitPrefs() { - return WebPreferences(); +webkit_glue::WebPreferences RenderViewHostDelegate::GetWebkitPrefs() { + return webkit_glue::WebPreferences(); } bool RenderViewHostDelegate::PreHandleKeyboardEvent( diff --git a/content/public/browser/render_view_host_delegate.h b/content/public/browser/render_view_host_delegate.h index 4d43760..17a4dc9 100644 --- a/content/public/browser/render_view_host_delegate.h +++ b/content/public/browser/render_view_host_delegate.h @@ -32,7 +32,10 @@ struct ViewHostMsg_DidFailProvisionalLoadWithError_Params; struct ViewHostMsg_FrameNavigate_Params; struct WebDropData; struct WebMenuItem; + +namespace webkit_glue { struct WebPreferences; +} namespace base { class ListValue; @@ -348,7 +351,7 @@ class CONTENT_EXPORT RenderViewHostDelegate : public IPC::Channel::Listener { // Returns a WebPreferences object that will be used by the renderer // associated with the owning render view host. - virtual WebPreferences GetWebkitPrefs(); + virtual webkit_glue::WebPreferences GetWebkitPrefs(); // Notification the user has made a gesture while focus was on the // page. This is used to avoid uninitiated user downloads (aka carpet diff --git a/content/public/renderer/render_view.h b/content/public/renderer/render_view.h index 966488f..7d291a4 100644 --- a/content/public/renderer/render_view.h +++ b/content/public/renderer/render_view.h @@ -12,7 +12,9 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageVisibilityState.h" #include "ui/gfx/native_widget_types.h" +namespace webkit_glue { struct WebPreferences; +} namespace WebKit { class WebFrame; @@ -66,7 +68,7 @@ class CONTENT_EXPORT RenderView : public IPC::Message::Sender { virtual gfx::NativeViewId GetHostWindow() const = 0; // Gets WebKit related preferences associated with this view. - virtual WebPreferences& GetWebkitPreferences() = 0; + virtual webkit_glue::WebPreferences& GetWebkitPreferences() = 0; // Returns the associated WebView. May return NULL when the view is closing. virtual WebKit::WebView* GetWebView() = 0; -- cgit v1.1