| Index: content/browser/tab_contents/tab_contents.cc
|
| diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
|
| index e621d89918a2fda717e93b03232b9e6e2376b43d..f6dbfeb1de6f6b25320e8d27e7d7c9f8a36ed4be 100644
|
| --- a/content/browser/tab_contents/tab_contents.cc
|
| +++ b/content/browser/tab_contents/tab_contents.cc
|
| @@ -122,6 +122,7 @@ using content::NavigationEntry;
|
| using content::NavigationEntryImpl;
|
| using content::OpenURLParams;
|
| using content::RenderViewHostDelegate;
|
| +using content::RenderWidgetHostViewPort;
|
| using content::SiteInstance;
|
| using content::SSLStatus;
|
| using content::UserMetricsAction;
|
| @@ -292,7 +293,7 @@ TabContents::~TabContents() {
|
| if (GetNativeView()) {
|
| RenderViewHost* host = GetRenderViewHost();
|
| if (host && host->view())
|
| - RenderWidgetHostViewBase::FromRWHV(host->view())->WillWmDestroy();
|
| + RenderWidgetHostViewPort::FromRWHV(host->view())->WillWmDestroy();
|
| }
|
| #endif
|
|
|
| @@ -761,8 +762,8 @@ void TabContents::NotifyNavigationStateChanged(unsigned changed_flags) {
|
|
|
| void TabContents::DidBecomeSelected() {
|
| controller_.SetActive(true);
|
| - RenderWidgetHostViewBase* rwhv =
|
| - RenderWidgetHostViewBase::FromRWHV(GetRenderWidgetHostView());
|
| + RenderWidgetHostViewPort* rwhv =
|
| + RenderWidgetHostViewPort::FromRWHV(GetRenderWidgetHostView());
|
| if (rwhv) {
|
| rwhv->DidBecomeSelected();
|
| #if defined(OS_MACOSX)
|
| @@ -795,8 +796,8 @@ void TabContents::WasHidden() {
|
| // removes the |GetRenderViewHost()|; then when we actually destroy the
|
| // window, OnWindowPosChanged() notices and calls HideContents() (which
|
| // calls us).
|
| - RenderWidgetHostViewBase* rwhv =
|
| - RenderWidgetHostViewBase::FromRWHV(GetRenderWidgetHostView());
|
| + RenderWidgetHostViewPort* rwhv =
|
| + RenderWidgetHostViewPort::FromRWHV(GetRenderWidgetHostView());
|
| if (rwhv)
|
| rwhv->WasHidden();
|
| }
|
| @@ -808,8 +809,8 @@ void TabContents::WasHidden() {
|
| }
|
|
|
| void TabContents::ShowContents() {
|
| - RenderWidgetHostViewBase* rwhv =
|
| - RenderWidgetHostViewBase::FromRWHV(GetRenderWidgetHostView());
|
| + RenderWidgetHostViewPort* rwhv =
|
| + RenderWidgetHostViewPort::FromRWHV(GetRenderWidgetHostView());
|
| if (rwhv)
|
| rwhv->DidBecomeSelected();
|
| }
|
|
|