Fix multiple problems with omnibox text handling across focus changes.

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
===================================================================
--- chrome/browser/ui/browser.h	(revision 224205)
+++ chrome/browser/ui/browser.h	(working copy)
@@ -437,10 +437,10 @@
   virtual void TabDetachedAt(content::WebContents* contents,
                              int index) OVERRIDE;
   virtual void TabDeactivated(content::WebContents* contents) OVERRIDE;
-  virtual void ActiveTabChanged(content::WebContents* old_contents,
-                                content::WebContents* new_contents,
-                                int index,
-                                int reason) OVERRIDE;
+  // We don't override ActiveTabChanged(); instead we expect a platform-specific
+  // TabStripModelObserver to call OnActiveTabChanged().  This allows the
+  // platform-specific handler to run first, which is important on views; see
+  // comments at the end of BrowserView::ActiveTabChanged().
   virtual void TabMoved(content::WebContents* contents,
                         int from_index,
                         int to_index) OVERRIDE;
@@ -452,6 +452,12 @@
                                      int index) OVERRIDE;
   virtual void TabStripEmpty() OVERRIDE;
 
+  // This is the replacement for ActiveTabChanged() (see above).
+  void OnActiveTabChanged(content::WebContents* old_contents,
+                        content::WebContents* new_contents,
+                        int index,
+                        int reason);
+
   // Overridden from content::WebContentsDelegate:
   virtual bool CanOverscrollContent() const OVERRIDE;
   virtual bool PreHandleKeyboardEvent(