| Index: content/browser/tab_contents/interstitial_page_impl.h
|
| diff --git a/content/browser/tab_contents/interstitial_page_impl.h b/content/browser/tab_contents/interstitial_page_impl.h
|
| index 6f1f27ad2c0d46bc15893b3d97b7cca8b3282f69..0bfdbf80597f2518cd9c3b6f3dc76b6bfef06ae9 100644
|
| --- a/content/browser/tab_contents/interstitial_page_impl.h
|
| +++ b/content/browser/tab_contents/interstitial_page_impl.h
|
| @@ -16,11 +16,11 @@
|
| #include "content/public/common/renderer_preferences.h"
|
| #include "googleurl/src/gurl.h"
|
|
|
| -class RenderViewHostImpl;
|
| class TabContents;
|
|
|
| namespace content {
|
| class NavigationEntry;
|
| +class RenderViewHostImpl;
|
| class WebContentsView;
|
| }
|
|
|
| @@ -53,7 +53,7 @@ class CONTENT_EXPORT InterstitialPageImpl
|
| virtual void Hide() OVERRIDE;
|
| virtual void DontProceed() OVERRIDE;
|
| virtual void Proceed() OVERRIDE;
|
| - virtual RenderViewHost* GetRenderViewHostForTesting() const OVERRIDE;
|
| + virtual content::RenderViewHost* GetRenderViewHostForTesting() const OVERRIDE;
|
| virtual content::InterstitialPageDelegate* GetDelegateForTesting() OVERRIDE;
|
| virtual void DontCreateViewForTesting() OVERRIDE;
|
| virtual void SetSize(const gfx::Size& size) OVERRIDE;
|
| @@ -83,13 +83,13 @@ class CONTENT_EXPORT InterstitialPageImpl
|
| // RenderViewHostDelegate implementation:
|
| virtual View* GetViewDelegate() OVERRIDE;
|
| virtual const GURL& GetURL() const OVERRIDE;
|
| - virtual void RenderViewGone(RenderViewHost* render_view_host,
|
| + virtual void RenderViewGone(content::RenderViewHost* render_view_host,
|
| base::TerminationStatus status,
|
| int error_code) OVERRIDE;
|
| virtual void DidNavigate(
|
| - RenderViewHost* render_view_host,
|
| + content::RenderViewHost* render_view_host,
|
| const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
|
| - virtual void UpdateTitle(RenderViewHost* render_view_host,
|
| + virtual void UpdateTitle(content::RenderViewHost* render_view_host,
|
| int32 page_id,
|
| const string16& title,
|
| base::i18n::TextDirection title_direction) OVERRIDE;
|
| @@ -109,7 +109,7 @@ class CONTENT_EXPORT InterstitialPageImpl
|
|
|
| // Creates the RenderViewHost containing the interstitial content.
|
| // Overriden in unit tests.
|
| - virtual RenderViewHost* CreateRenderViewHost();
|
| + virtual content::RenderViewHost* CreateRenderViewHost();
|
|
|
| // Creates the WebContentsView that shows the interstitial RVH.
|
| // Overriden in unit tests.
|
| @@ -160,7 +160,7 @@ class CONTENT_EXPORT InterstitialPageImpl
|
| ActionState action_taken_;
|
|
|
| // The RenderViewHost displaying the interstitial contents.
|
| - RenderViewHostImpl* render_view_host_;
|
| + content::RenderViewHostImpl* render_view_host_;
|
|
|
| // The IDs for the Render[View|Process]Host hidden by this interstitial.
|
| int original_child_id_;
|
|
|