Making the focus remembering across tab switch work.

chrome/browser/views/tab_contents/tab_contents_view_gtk.cc

 // Copyright (c) 2009 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_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "base/string_util.h"
 #include "base/gfx/point.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/size.h"
 #include "build/build_config.h"
 #include "chrome/browser/blocked_popup_container.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/gtk/tab_contents_drag_source.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_factory.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/browser/tab_contents/interstitial_page.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
 #include "chrome/browser/views/sad_tab_view.h"
 #include "chrome/browser/views/tab_contents/render_view_context_menu_win.h"
+#include "views/focus/view_storage.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/widget/root_view.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebInputEvent;
 
 
 namespace {
 
@@ skipping 54 matching lines @@
 // static
 TabContentsView* TabContentsView::Create(TabContents* tab_contents) {
   return new TabContentsViewGtk(tab_contents);
 }
 
 TabContentsViewGtk::TabContentsViewGtk(TabContents* tab_contents)
     : TabContentsView(tab_contents),
       views::WidgetGtk(TYPE_CHILD),
       ignore_next_char_event_(false) {
   drag_source_.reset(new TabContentsDragSource(this));
+  last_focused_view_storage_id_ =
+      views::ViewStorage::GetSharedInstance()->CreateStorageID();
 }
 
 TabContentsViewGtk::~TabContentsViewGtk() {
+  // Make 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_);
+
   // Just deleting the object doesn't destroy the GtkWidget. We need to do that
   // manually, and synchronously, since subsequent signal handlers may expect
   // to locate this object.
   CloseNow();
 }
 
 void TabContentsViewGtk::CreateView() {
   set_delete_on_destroy(false);
   WidgetGtk::Init(NULL, gfx::Rect());
 }
@@ skipping 98 matching lines @@
 }
 
 void TabContentsViewGtk::SetInitialFocus() {
   if (tab_contents()->FocusLocationBarByDefault())
     tab_contents()->delegate()->SetFocusToLocationBar();
   else
     Focus();
 }
 
 void TabContentsViewGtk::StoreFocus() {
-  NOTIMPLEMENTED();
+  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::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);
+  }
 }
 
 void TabContentsViewGtk::RestoreFocus() {
-  NOTIMPLEMENTED();
-  SetInitialFocus();
+  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::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
+      // no longer be focusable (e.g. if the location bar was focused and then
+      // we switched to fullscreen mode).  In that case we default to the
+      // default focus.
+      SetInitialFocus();
+    }
+    view_storage->RemoveView(last_focused_view_storage_id_);
+  }
 }
 
 void TabContentsViewGtk::UpdateDragCursor(WebDragOperation operation) {
   NOTIMPLEMENTED();
 }
 
 void TabContentsViewGtk::GotFocus() {
   tab_contents()->delegate()->TabContentsFocused(tab_contents());
 }
 
@@ skipping 102 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BlockedPopupContainerViewGtk);
 };
 
 // static
 BlockedPopupContainerView* BlockedPopupContainerView::Create(
     BlockedPopupContainer* container) {
   return new BlockedPopupContainerViewGtk;
 }