Moving the WM_SETFOCUS message processing out of FocusManager

chrome/browser/tab_contents/tab_contents_view_win.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
 #include "app/gfx/canvas.h"
 #include "app/os_exchange_data.h"
@@ skipping 214 matching lines @@
   if (::IsWindow(GetNativeView()))
     InvalidateRect(GetNativeView(), NULL, FALSE);
 }
 
 void TabContentsViewWin::SizeContents(const gfx::Size& size) {
   // TODO(brettw) this is a hack and should be removed. See tab_contents_view.h.
   WasSized(size);
 }
 
 void TabContentsViewWin::Focus() {
-  HWND container_hwnd = GetNativeView();
-  if (!container_hwnd)
+  views::FocusManager* focus_manager =
+      views::FocusManager::GetFocusManager(GetNativeView());
+
+  if (tab_contents()->interstitial_page()) {
+    tab_contents()->interstitial_page()->Focus();
     return;
+  }
 
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(container_hwnd);
-  if (!focus_manager)
-    return;  // During testing we have no focus manager.
-  views::View* v = focus_manager->GetViewForWindow(container_hwnd, true);
-  DCHECK(v);
-  if (v)
-    v->RequestFocus();
+  if (sad_tab_.get()) {
+    sad_tab_->RequestFocus();
+    return;
+  }
+
+  RenderWidgetHostView* rwhv = tab_contents()->render_widget_host_view();
+  if (rwhv) {
+    ::SetFocus(rwhv->GetNativeView());
+    return;
+  }
+
+  // Default to focusing our HWND.
+  ::SetFocus(GetNativeView());
 }
 
 void TabContentsViewWin::SetInitialFocus() {
   if (tab_contents()->FocusLocationBarByDefault())
     tab_contents()->delegate()->SetFocusToLocationBar();
   else
-    ::SetFocus(GetNativeView());
+    Focus();
 }
 
 void TabContentsViewWin::StoreFocus() {
   views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
 
   if (view_storage->RetrieveView(last_focused_view_storage_id_) != NULL)
     view_storage->RemoveView(last_focused_view_storage_id_);
 
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManager(GetNativeView());
@@ skipping 45 matching lines @@
       SetInitialFocus();
     }
     view_storage->RemoveView(last_focused_view_storage_id_);
   }
 }
 
 void TabContentsViewWin::UpdateDragCursor(bool is_drop_target) {
   drop_target_->set_is_drop_target(is_drop_target);
 }
 
+void TabContentsViewWin::GotFocus() {
+  tab_contents()->delegate()->TabContentsFocused(tab_contents());
+}
+
 void TabContentsViewWin::TakeFocus(bool reverse) {
   if (!tab_contents()->delegate()->TakeFocus(reverse)) {
     views::FocusManager* focus_manager =
         views::FocusManager::GetFocusManager(GetNativeView());
 
     // We may not have a focus manager if the tab has been switched before this
     // message arrived.
     if (focus_manager)
       focus_manager->AdvanceFocus(reverse);
   }
@@ skipping 149 matching lines @@
     case WM_VSCROLL:
       if (ScrollZoom(LOWORD(message->wParam)))
         return 1;
     default:
       break;
   }
 
   return 0;
 }
 
-void TabContentsViewWin::OnSetFocus(HWND window) {
-  // TODO(jcampan): figure out why removing this prevents tabs opened in the
-  //                background from properly taking focus.
-  // We NULL-check the render_view_host_ here because Windows can send us
-  // messages during the destruction process after it has been destroyed.
-  if (tab_contents()->render_widget_host_view()) {
-    HWND inner_hwnd =
-        tab_contents()->render_widget_host_view()->GetNativeView();
-    if (::IsWindow(inner_hwnd))
-      ::SetFocus(inner_hwnd);
-  }
-}
-
 void TabContentsViewWin::OnVScroll(int scroll_type, short position,
                                    HWND scrollbar) {
   ScrollCommon(WM_VSCROLL, scroll_type, position, scrollbar);
 }
 
 void TabContentsViewWin::OnWindowPosChanged(WINDOWPOS* window_pos) {
   if (window_pos->flags & SWP_HIDEWINDOW) {
     WasHidden();
   } else {
     // The TabContents was shown by a means other than the user selecting a
@@ skipping 101 matching lines @@
   }
   return false;
 }
 
 void TabContentsViewWin::WheelZoom(int distance) {
   if (tab_contents()->delegate()) {
     bool zoom_in = distance > 0;
     tab_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }