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/browser/web_contents/interstitial_page_impl.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/browser/web_contents/interstitial_page_impl.h')
| -rw-r--r-- | content/browser/web_contents/interstitial_page_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/web_contents/interstitial_page_impl.h b/content/browser/web_contents/interstitial_page_impl.h index f305f20..ceca2cb 100644 --- a/content/browser/web_contents/interstitial_page_impl.h +++ b/content/browser/web_contents/interstitial_page_impl.h @@ -95,7 +95,7 @@ class CONTENT_EXPORT InterstitialPageImpl base::i18n::TextDirection title_direction) OVERRIDE; virtual content::RendererPreferences GetRendererPrefs( content::BrowserContext* browser_context) const OVERRIDE; - virtual WebPreferences GetWebkitPrefs() OVERRIDE; + virtual webkit_glue::WebPreferences GetWebkitPrefs() OVERRIDE; virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event, bool* is_keyboard_shortcut) OVERRIDE; virtual void HandleKeyboardEvent( |