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 /ui/views | |
| 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 'ui/views')
| -rw-r--r-- | ui/views/examples/content_client/examples_content_browser_client.cc | 2 | ||||
| -rw-r--r-- | ui/views/examples/content_client/examples_content_browser_client.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/examples/content_client/examples_content_browser_client.cc b/ui/views/examples/content_client/examples_content_browser_client.cc index 3dabb91..419171a 100644 --- a/ui/views/examples/content_client/examples_content_browser_client.cc +++ b/ui/views/examples/content_client/examples_content_browser_client.cc @@ -308,7 +308,7 @@ bool ExamplesContentBrowserClient::IsFastShutdownPossible() { void ExamplesContentBrowserClient::OverrideWebkitPrefs( content::RenderViewHost* rvh, const GURL& url, - WebPreferences* prefs) { + webkit_glue::WebPreferences* prefs) { } void ExamplesContentBrowserClient::UpdateInspectorSetting( diff --git a/ui/views/examples/content_client/examples_content_browser_client.h b/ui/views/examples/content_client/examples_content_browser_client.h index 6addff2..e7b2ccd 100644 --- a/ui/views/examples/content_client/examples_content_browser_client.h +++ b/ui/views/examples/content_client/examples_content_browser_client.h @@ -165,7 +165,7 @@ class ExamplesContentBrowserClient : public content::ContentBrowserClient { virtual bool IsFastShutdownPossible() OVERRIDE; virtual void OverrideWebkitPrefs(content::RenderViewHost* rvh, const GURL& url, - WebPreferences* prefs) OVERRIDE; + webkit_glue::WebPreferences* prefs) OVERRIDE; virtual void UpdateInspectorSetting(content::RenderViewHost* rvh, const std::string& key, const std::string& value) OVERRIDE; |