From 7a2c14224b1e53691c2846a0f84cb5f5fcabfc69 Mon Sep 17 00:00:00 2001 From: "kuchhal@chromium.org" Date: Tue, 10 Feb 2009 18:23:44 +0000 Subject: Try reverting r9409 to see if it fixes crashes on chromebot. TBR=avi Review URL: http://codereview.chromium.org/21215 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9481 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/tab_contents_container_view.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'chrome/browser/views/tab_contents_container_view.cc') diff --git a/chrome/browser/views/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc index 6c8e0c3..3228dba 100644 --- a/chrome/browser/views/tab_contents_container_view.cc +++ b/chrome/browser/views/tab_contents_container_view.cc @@ -34,7 +34,7 @@ void TabContentsContainerView::SetTabContents(TabContents* tab_contents) { if (tab_contents_) { // TODO(brettw) should this move to HWNDView::Detach which is called below? // It needs cleanup regardless. - HWND container_hwnd = tab_contents_->GetNativeView(); + HWND container_hwnd = tab_contents_->GetContainerHWND(); // Hide the contents before adjusting its parent to avoid a full desktop // flicker. @@ -47,7 +47,7 @@ void TabContentsContainerView::SetTabContents(TabContents* tab_contents) { // Unregister the tab contents window from the FocusManager. views::FocusManager::UninstallFocusSubclass(container_hwnd); - HWND hwnd = tab_contents_->GetContentNativeView(); + HWND hwnd = tab_contents_->GetContentHWND(); if (hwnd) { // We may not have an HWND anymore, if the renderer crashed and we are // displaying the sad tab for example. @@ -80,8 +80,8 @@ void TabContentsContainerView::SetTabContents(TabContents* tab_contents) { // TabContents window (for the WebContents case). SetAssociatedFocusView(this); - Attach(tab_contents->GetNativeView()); - HWND contents_hwnd = tab_contents_->GetContentNativeView(); + Attach(tab_contents->GetContainerHWND()); + HWND contents_hwnd = tab_contents_->GetContentHWND(); if (contents_hwnd) FocusManager::InstallFocusSubclass(contents_hwnd, this); @@ -151,7 +151,7 @@ views::View* TabContentsContainerView::GetFocusTraversableParentView() { void TabContentsContainerView::Focus() { if (tab_contents_ && !tab_contents_->GetContentsRootView()) { // Set the native focus on the actual content of the tab. - ::SetFocus(tab_contents_->GetContentNativeView()); + ::SetFocus(tab_contents_->GetContentHWND()); } } -- cgit v1.1