diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 23:31:25 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 23:31:25 +0000 |
| commit | 6717bf27e115a3745e0418688436139c58dac753 (patch) | |
| tree | 523fa301eeff4c292a140b56486e027bd075b0ed /content/public/browser/content_browser_client.h | |
| parent | d1c1aa2d06acaf9bf3f55734a72bb28835367370 (diff) | |
| download | chromium_src-6717bf27e115a3745e0418688436139c58dac753.zip chromium_src-6717bf27e115a3745e0418688436139c58dac753.tar.gz chromium_src-6717bf27e115a3745e0418688436139c58dac753.tar.bz2 | |
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
Diffstat (limited to 'content/public/browser/content_browser_client.h')
| -rw-r--r-- | content/public/browser/content_browser_client.h | 5 |
1 files changed, 4 insertions, 1 deletions
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, |