Fix multiple problems with omnibox text handling across focus changes.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright 2012 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/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 772 matching lines @@
     // the animations are running slowly and this function is called on
     // a timer through LoadingAnimationCallback.
     titlebar_->UpdateThrobber(web_contents);
   }
 }
 
 void BrowserWindowGtk::SetStarredState(bool is_starred) {
   toolbar_->GetLocationBarView()->SetStarred(is_starred);
 }
 
+void BrowserWindowGtk::OnActiveTabChanged(WebContents* old_contents,
+                                          WebContents* new_contents,
+                                          int index,
+                                          int reason) {
+  TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::ActiveTabChanged");
+  if (old_contents && !old_contents->IsBeingDestroyed())
+    old_contents->GetView()->StoreFocus();
+
+  // Update various elements that are interested in knowing the current
+  // WebContents.
+  UpdateDevToolsForContents(new_contents);
+  infobar_container_->ChangeInfoBarService(
+      InfoBarService::FromWebContents(new_contents));
+  contents_container_->SetTab(new_contents);
+
+  // TODO(estade): after we manage browser activation, add a check to make sure
+  // we are the active browser before calling RestoreFocus().
+  if (!browser_->tab_strip_model()->closing_all()) {
+    new_contents->GetView()->RestoreFocus();
+    FindTabHelper* find_tab_helper =
+        FindTabHelper::FromWebContents(new_contents);
+    if (find_tab_helper->find_ui_active())
+      browser_->GetFindBarController()->find_bar()->SetFocusAndSelection();
+  }
+
+  // Update all the UI bits.
+  UpdateTitleBar();
+  MaybeShowBookmarkBar(false);
+}
 void BrowserWindowGtk::ZoomChangedForActiveTab(bool can_show_bubble) {
   toolbar_->GetLocationBarView()->ZoomChangedForActiveTab(
       can_show_bubble && !toolbar_->IsWrenchMenuShowing());
 }
 
 gfx::Rect BrowserWindowGtk::GetRestoredBounds() const {
   return restored_bounds_;
 }
 
 ui::WindowShowState BrowserWindowGtk::GetRestoredState() const {
@@ skipping 406 matching lines @@
   // the model has already removed |contents| from its list, so
   // browser_->tab_strip_model()->GetActiveWebContents() will return NULL or
   // something else.
   if (index == browser_->tab_strip_model()->active_index()) {
     infobar_container_->ChangeInfoBarService(NULL);
     UpdateDevToolsForContents(NULL);
   }
   contents_container_->DetachTab(contents);
 }
 
-void BrowserWindowGtk::ActiveTabChanged(WebContents* old_contents,
-                                        WebContents* new_contents,
-                                        int index,
-                                        int reason) {
-  TRACE_EVENT0("ui::gtk", "BrowserWindowGtk::ActiveTabChanged");
-  if (old_contents && !old_contents->IsBeingDestroyed())
-    old_contents->GetView()->StoreFocus();
-
-  // Update various elements that are interested in knowing the current
-  // WebContents.
-  UpdateDevToolsForContents(new_contents);
-  infobar_container_->ChangeInfoBarService(
-      InfoBarService::FromWebContents(new_contents));
-  contents_container_->SetTab(new_contents);
-
-  // TODO(estade): after we manage browser activation, add a check to make sure
-  // we are the active browser before calling RestoreFocus().
-  if (!browser_->tab_strip_model()->closing_all()) {
-    new_contents->GetView()->RestoreFocus();
-    FindTabHelper* find_tab_helper =
-        FindTabHelper::FromWebContents(new_contents);
-    if (find_tab_helper->find_ui_active())
-      browser_->GetFindBarController()->find_bar()->SetFocusAndSelection();
-  }
-
-  // Update all the UI bits.
-  UpdateTitleBar();
-  MaybeShowBookmarkBar(false);
-}
-
 void BrowserWindowGtk::ActiveWindowChanged(GdkWindow* active_window) {
   // Do nothing if we're in the process of closing the browser window.
   if (!window_)
     return;
 
   bool is_active = gtk_widget_get_window(GTK_WIDGET(window_)) == active_window;
   bool changed = (is_active != is_active_);
 
   if (is_active && changed) {
     // If there's an app modal dialog (e.g., JS alert), try to redirect
@@ skipping 1155 matching lines @@
           wm_type == ui::WM_OPENBOX ||
           wm_type == ui::WM_XFWM4);
 }
 
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   BrowserWindowGtk* browser_window_gtk = new BrowserWindowGtk(browser);
   browser_window_gtk->Init();
   return browser_window_gtk;
 }