A patch to fix a couple of issues in interactive_ui_tests on ChromeOS

chrome/browser/views/tab_contents/tab_contents_view_gtk.cc

 // Copyright (c) 2010 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"
@@ skipping 308 matching lines @@
 
 void TabContentsViewGtk::UpdateDragCursor(WebDragOperation operation) {
   drag_dest_->UpdateDragStatus(operation);
 }
 
 void TabContentsViewGtk::GotFocus() {
   tab_contents()->delegate()->TabContentsFocused(tab_contents());
 }
 
 void TabContentsViewGtk::TakeFocus(bool reverse) {
-  // This is called when we the renderer asks us to take focus back (i.e., it
-  // has iterated past the last focusable element on the page).
-  gtk_widget_child_focus(GTK_WIDGET(GetTopLevelNativeWindow()),
-      reverse ? GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD);
+  if (!tab_contents()->delegate()->TakeFocus(reverse)) {
+
+    views::FocusManager* focus_manager =
+        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 TabContentsViewGtk::ShowContextMenu(const ContextMenuParams& params) {
   // Allow delegates to handle the context menu operation first.
   if (tab_contents()->delegate()->HandleContextMenu(params))
     return;
 
   context_menu_.reset(new RenderViewContextMenuGtk(tab_contents(), params));
   context_menu_->Init();
 
@@ skipping 97 matching lines @@
 // not NULL, else our delegate.
 gboolean TabContentsViewGtk::OnMouseMove(GtkWidget* widget,
                                          GdkEventMotion* event) {
   if (sad_tab_ != NULL)
     WidgetGtk::OnMotionNotify(widget, event);
   else if (tab_contents()->delegate())
     tab_contents()->delegate()->ContentsMouseEvent(
         tab_contents(), views::Screen::GetCursorScreenPoint(), true);
   return FALSE;
 }