Relanding focus manager refactoring

chrome/browser/views/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/views/tab_contents/tab_contents_view_win.h"
 
 #include <windows.h>
 
 #include "app/gfx/canvas_paint.h"
 #include "app/os_exchange_data.h"
@@ skipping 35 matching lines @@
 
 }  // namespace
 
 // static
 TabContentsView* TabContentsView::Create(TabContents* tab_contents) {
   return new TabContentsViewWin(tab_contents);
 }
 
 TabContentsViewWin::TabContentsViewWin(TabContents* tab_contents)
     : TabContentsView(tab_contents),
-      ignore_next_char_event_(false) {
+      ignore_next_char_event_(false),
+      focus_manager_(NULL) {
   last_focused_view_storage_id_ =
       views::ViewStorage::GetSharedInstance()->CreateStorageID();
 }
 
 TabContentsViewWin::~TabContentsViewWin() {
   // Makes sure to remove any stored view we may still have in the ViewStorage.
   //
   // It is possible the view went away before us, so we only do this if the
   // view is registered.
   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_);
 }
 
+void TabContentsViewWin::Unparent() {
+  // Remember who our FocusManager is, we won't be able to access it once
+  // unparented.
+  focus_manager_ = views::WidgetWin::GetFocusManager();
+  // Note that we do not DCHECK on focus_manager_ as it may be NULL when used
+  // with an external tab container.
+  ::SetParent(GetNativeView(), NULL);
+}
+
 void TabContentsViewWin::CreateView() {
   set_delete_on_destroy(false);
   // Since we create these windows parented to the desktop window initially, we
   // don't want to create them initially visible.
   set_window_style(WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
-  WidgetWin::Init(GetDesktopWindow(), gfx::Rect(), false);
+  WidgetWin::Init(GetDesktopWindow(), gfx::Rect());
 
   // Remove the root view drop target so we can register our own.
   RevokeDragDrop(GetNativeView());
   drop_target_ = new WebDropTarget(GetNativeView(), tab_contents());
 }
 
 RenderWidgetHostView* TabContentsViewWin::CreateViewForWidget(
     RenderWidgetHost* render_widget_host) {
   if (render_widget_host->view()) {
     // During testing, the view will already be set up in most cases to the
@@ skipping 139 matching lines @@
     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() {
   views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetNativeView());
+      views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
 
   if (tab_contents()->interstitial_page()) {
     tab_contents()->interstitial_page()->Focus();
     return;
   }
 
   if (sad_tab_.get()) {
     sad_tab_->RequestFocus();
     return;
   }
@@ skipping 15 matching lines @@
     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());
+      views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
   if (focus_manager) {
     // |focus_manager| can be NULL if the tab has been detached but still
     // exists.
     views::View* focused_view = focus_manager->GetFocusedView();
     if (focused_view)
       view_storage->StoreView(last_focused_view_storage_id_, focused_view);
 
     // If the focus was on the page, explicitly clear the focus so that we
     // don't end up with the focused HWND not part of the window hierarchy.
     // TODO(brettw) this should move to the view somehow.
@@ skipping 11 matching lines @@
 
 void TabContentsViewWin::RestoreFocus() {
   views::ViewStorage* view_storage = views::ViewStorage::GetSharedInstance();
   views::View* last_focused_view =
       view_storage->RetrieveView(last_focused_view_storage_id_);
 
   if (!last_focused_view) {
     SetInitialFocus();
   } else {
     views::FocusManager* focus_manager =
-        views::FocusManager::GetFocusManager(GetNativeView());
+        views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
 
     // If you hit this DCHECK, please report it to Jay (jcampan).
     DCHECK(focus_manager != NULL) << "No focus manager when restoring focus.";
 
     if (last_focused_view->IsFocusable() && focus_manager &&
         focus_manager->ContainsView(last_focused_view)) {
       last_focused_view->RequestFocus();
     } else {
       // The focused view may not belong to the same window hierarchy (e.g.
       // if the location bar was focused and the tab is dragged out), or it may
@@ skipping 11 matching lines @@
 }
 
 void TabContentsViewWin::GotFocus() {
   if (tab_contents()->delegate())
     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());
+        views::FocusManager::GetFocusManagerForNativeView(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);
   }
 }
 
 void TabContentsViewWin::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
   // Previous calls to TranslateMessage can generate CHAR events as well as
   // RAW_KEY_DOWN events, even if the latter triggered an accelerator.  In these
   // cases, we discard the CHAR events.
   if (event.type == WebInputEvent::Char && ignore_next_char_event_) {
     ignore_next_char_event_ = false;
     return;
   }
   ignore_next_char_event_ = false;
 
   // The renderer returned a keyboard event it did not process. This may be
   // a keyboard shortcut that we have to process.
   if (event.type == WebInputEvent::RawKeyDown) {
     views::FocusManager* focus_manager =
-        views::FocusManager::GetFocusManager(GetNativeView());
+        views::FocusManager::GetFocusManagerForNativeView(GetNativeView());
     // We may not have a focus_manager at this point (if the tab has been
     // switched by the time this message returned).
     if (focus_manager) {
       views::Accelerator accelerator(event.windowsKeyCode,
           (event.modifiers & WebInputEvent::ShiftKey) ==
               WebInputEvent::ShiftKey,
           (event.modifiers & WebInputEvent::ControlKey) ==
               WebInputEvent::ControlKey,
           (event.modifiers & WebInputEvent::AltKey) ==
               WebInputEvent::AltKey);
@@ skipping 15 matching lines @@
   }
 
   // Any unhandled keyboard/character messages should be defproced.
   // This allows stuff like Alt+F4, etc to work correctly.
   DefWindowProc(event.os_event.hwnd,
                 event.os_event.message,
                 event.os_event.wParam,
                 event.os_event.lParam);
 }
 
+views::FocusManager* TabContentsViewWin::GetFocusManager() {
+  views::FocusManager* focus_manager = WidgetWin::GetFocusManager();
+  if (focus_manager) {
+    // If focus_manager_ is non NULL, it means we have been reparented, in which
+    // case its value may not be valid anymore.
+    focus_manager_ = NULL;
+    return focus_manager;
+  }
+
+  DCHECK(focus_manager_);
+  return focus_manager_;
+}
+
 void TabContentsViewWin::ShowContextMenu(const ContextMenuParams& params) {
   // Allow delegates to handle the context menu operation first.
   if (tab_contents()->delegate()->HandleContextMenu(params))
     return;
 
   context_menu_.reset(new RenderViewContextMenuWin(tab_contents(), params));
   context_menu_->Init();
 
   POINT screen_pt = { params.x, params.y };
   MapWindowPoints(GetNativeView(), HWND_DESKTOP, &screen_pt, 1);
@@ skipping 203 matching lines @@
   }
   return false;
 }
 
 void TabContentsViewWin::WheelZoom(int distance) {
   if (tab_contents()->delegate()) {
     bool zoom_in = distance > 0;
     tab_contents()->delegate()->ContentsZoomChange(zoom_in);
   }
 }