diff options
| author | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 17:48:20 +0000 |
|---|---|---|
| committer | vollick@google.com <vollick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-14 17:48:20 +0000 |
| commit | 03d12f0c42aa5c11673e9b2dcec1d1966fb49589 (patch) | |
| tree | e5bd24af8ade6f77100576bb144a90fe7a8374df /content/browser/tab_contents/interstitial_page_impl.cc | |
| parent | 13fc4b42892ee3f0821e49a368afbd2693bcf227 (diff) | |
| download | chromium_src-03d12f0c42aa5c11673e9b2dcec1d1966fb49589.zip chromium_src-03d12f0c42aa5c11673e9b2dcec1d1966fb49589.tar.gz chromium_src-03d12f0c42aa5c11673e9b2dcec1d1966fb49589.tar.bz2 | |
Revert 121896 - Extract RenderWidgetHostView (for Chrome-like embedders) vs. RenderWidgetHostViewBase
(for content itself, and for embedders porting to other platforms).
Attempting to fix win_aura build failure.
BUG=98716
Review URL: http://codereview.chromium.org/9307055
TBR=joi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9348090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents/interstitial_page_impl.cc')
| -rw-r--r-- | content/browser/tab_contents/interstitial_page_impl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/browser/tab_contents/interstitial_page_impl.cc b/content/browser/tab_contents/interstitial_page_impl.cc index 8a91f42..9f5184b 100644 --- a/content/browser/tab_contents/interstitial_page_impl.cc +++ b/content/browser/tab_contents/interstitial_page_impl.cc @@ -273,8 +273,7 @@ void InterstitialPageImpl::Hide() { // (Note that in unit-tests the RVH may not have a view). if (render_view_host_->view() && render_view_host_->view()->HasFocus() && tab_->GetRenderViewHost()->view()) { - RenderWidgetHostViewBase::FromRWHV( - tab_->GetRenderViewHost()->view())->Focus(); + tab_->GetRenderViewHost()->view()->Focus(); } render_view_host_->Shutdown(); @@ -595,7 +594,7 @@ void InterstitialPageImpl::SetSize(const gfx::Size& size) { void InterstitialPageImpl::Focus() { // Focus the native window. - RenderWidgetHostViewBase::FromRWHV(render_view_host_->view())->Focus(); + render_view_host_->view()->Focus(); } void InterstitialPageImpl::FocusThroughTabTraversal(bool reverse) { |