reland r57885 with a fix for linux/views.

chrome/browser/gtk/focus_store_gtk.cc

Index: chrome/browser/gtk/focus_store_gtk.cc
diff --git a/chrome/browser/gtk/focus_store_gtk.cc b/chrome/browser/gtk/focus_store_gtk.cc
index dc099fca198e3273da68861869adc3df236131ca..50ebfa766baaf2dc7ee951194256b858c4e60d6b 100644
--- a/chrome/browser/gtk/focus_store_gtk.cc
+++ b/chrome/browser/gtk/focus_store_gtk.cc
@@ -19,19 +19,22 @@ FocusStoreGtk::~FocusStoreGtk() {
 }
 
 void FocusStoreGtk::Store(GtkWidget* widget) {
-  DisconnectDestroyHandler();
-  if (!widget) {
-    widget_ = NULL;
-    return;
+  GtkWidget* focus_widget = NULL;
+  if (widget) {
+    GtkWindow* window = platform_util::GetTopLevel(widget);
+    if (window)
+      focus_widget = window->focus_widget;
   }
 
-  GtkWindow* window = platform_util::GetTopLevel(widget);
-  if (!window) {
-    widget_ = NULL;
-    return;
-  }
+  SetWidget(focus_widget);
+}
 
-  widget_ = window->focus_widget;
+void FocusStoreGtk::SetWidget(GtkWidget* widget) {
+  DisconnectDestroyHandler();
+
+  // We don't add a ref. The signal handler below effectively gives us a weak
+  // reference.
+  widget_ = widget;
   if (widget_) {
     // When invoked, |gtk_widget_destroyed| will set |widget_| to NULL.
     destroy_handler_id_ = g_signal_connect(widget_, "destroy",
@@ -41,6 +44,8 @@ void FocusStoreGtk::Store(GtkWidget* widget) {
 }
 
 void FocusStoreGtk::DisconnectDestroyHandler() {
-  if (widget_)
+  if (widget_) {
     g_signal_handler_disconnect(widget_, destroy_handler_id_);
+    widget_ = NULL;
+  }
 }