Fix multiple problems with omnibox text handling across focus changes.

chrome/browser/ui/views/omnibox/omnibox_view_views.h

Index: chrome/browser/ui/views/omnibox/omnibox_view_views.h
===================================================================
--- chrome/browser/ui/views/omnibox/omnibox_view_views.h	(revision 224205)
+++ chrome/browser/ui/views/omnibox/omnibox_view_views.h	(working copy)
@@ -75,6 +75,9 @@
   virtual void OnTabChanged(const content::WebContents* web_contents) OVERRIDE;
   virtual void Update() OVERRIDE;
   virtual string16 GetText() const OVERRIDE;
+  virtual void SetUserText(const string16& text,
+                           const string16& display_text,
+                           bool update_popup) OVERRIDE;
   virtual void SetWindowTextAndCaretPos(const string16& text,
                                         size_t caret_pos,
                                         bool update_popup,
@@ -85,6 +88,7 @@
   virtual void GetSelectionBounds(string16::size_type* start,
                                   string16::size_type* end) const OVERRIDE;
   virtual void SelectAll(bool reversed) OVERRIDE;
+  virtual void RevertAll() OVERRIDE;
   virtual void UpdatePopup() OVERRIDE;
   virtual void SetFocus() OVERRIDE;
   virtual void ApplyCaretVisibility() OVERRIDE;
@@ -170,6 +174,10 @@
   // Selection persisted across temporary text changes, like popup suggestions.
   gfx::Range saved_temporary_selection_;
 
+  // Holds the user's selection across focus changes.  There is only a saved
+  // selection if this range IsValid().
+  gfx::Range saved_selection_for_focus_change_;
+
   // Tracking state before and after a possible change.
   string16 text_before_change_;
   gfx::Range sel_before_change_;