Index: content/browser/tab_contents/interstitial_page.h |
=================================================================== |
--- content/browser/tab_contents/interstitial_page.h (revision 108004) |
+++ content/browser/tab_contents/interstitial_page.h (working copy) |
@@ -13,9 +13,9 @@ |
#include "base/process_util.h" |
#include "content/browser/renderer_host/render_view_host_delegate.h" |
#include "content/common/content_export.h" |
-#include "content/common/renderer_preferences.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
+#include "content/public/common/renderer_preferences.h" |
#include "googleurl/src/gurl.h" |
#include "ui/gfx/size.h" |
@@ -129,7 +129,7 @@ |
int32 page_id, |
const string16& title, |
base::i18n::TextDirection title_direction) OVERRIDE; |
- virtual RendererPreferences GetRendererPrefs( |
+ virtual content::RendererPreferences GetRendererPrefs( |
content::BrowserContext* browser_context) const OVERRIDE; |
// Invoked with the NavigationEntry that is going to be added to the |
@@ -143,7 +143,7 @@ |
TabContents* tab() const { return tab_; } |
const GURL& url() const { return url_; } |
RenderViewHost* render_view_host() const { return render_view_host_; } |
- void set_renderer_preferences(const RendererPreferences& prefs) { |
+ void set_renderer_preferences(const content::RendererPreferences& prefs) { |
renderer_preferences_ = prefs; |
} |
@@ -239,7 +239,7 @@ |
static InterstitialPageMap* tab_to_interstitial_page_; |
// Settings passed to the renderer. |
- RendererPreferences renderer_preferences_; |
+ content::RendererPreferences renderer_preferences_; |
DISALLOW_COPY_AND_ASSIGN(InterstitialPage); |
}; |