Fixes regression (and crash) in instant. The crash would happen if

chrome/browser/instant/instant_controller.cc

 // Copyright (c) 2011 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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
@@ skipping 14 matching lines @@
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_service.h"
 
+#if defined(TOOLKIT_VIEWS)
+#include "views/focus/focus_manager.h"
+#include "views/view.h"
+#include "views/widget/widget.h"
+#endif
+
 namespace {
 
 // Number of ms to delay between loading urls.
 const int kUpdateDelayMS = 200;
 
 // Amount of time we delay before showing pages that have a non-200 status.
 const int kShowDelayMS = 800;
 
 bool IsBlacklistedUrl(const GURL& url) {
   for (int i = 0; i < chrome::kNumberOfChromeDebugURLs; ++i) {
@@ skipping 300 matching lines @@
     return;
   }
 
   RenderWidgetHostView* rwhv =
       GetPreviewContents()->tab_contents()->GetRenderWidgetHostView();
   if (!view_gaining_focus || !rwhv) {
     DestroyPreviewContents();
     return;
   }
 
+#if defined(TOOLKIT_VIEWS)
+  // For views the top level widget is always focused. If the focus change
+  // originated in views determine the child Widget from the view that is being
+  // focused.
+  if (view_gaining_focus) {
+    views::Widget* widget =
+        views::Widget::GetWidgetForNativeView(view_gaining_focus);
+    if (widget) {
+      views::FocusManager* focus_manager = widget->GetFocusManager();
+      if (focus_manager && focus_manager->is_changing_focus() &&
+          focus_manager->GetFocusedView() &&
+          focus_manager->GetFocusedView()->GetWidget()) {
+        view_gaining_focus =
+            focus_manager->GetFocusedView()->GetWidget()->GetNativeView();
+      }
+    }
+  }
+#endif
+
   gfx::NativeView tab_view =
       GetPreviewContents()->tab_contents()->GetNativeView();
   // Focus is going to the renderer.
   if (rwhv->GetNativeView() == view_gaining_focus ||
       tab_view == view_gaining_focus) {
     if (!IsMouseDownFromActivate()) {
       // If the mouse is not down, focus is not going to the renderer. Someone
       // else moved focus and we shouldn't commit.
       DestroyPreviewContents();
       return;
@@ skipping 397 matching lines @@
   if (destroy_factory_.empty()) {
     MessageLoop::current()->PostTask(
         FROM_HERE, destroy_factory_.NewRunnableMethod(
             &InstantController::DestroyLoaders));
   }
 }
 
 void InstantController::DestroyLoaders() {
   loaders_to_destroy_.reset();
 }