Fix text and selection's save/restore issue of omnibox when displaying tempor...

chrome/browser/autocomplete/autocomplete_edit_view_mac.mm

 // Copyright (c) 2009 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/autocomplete/autocomplete_edit_view_mac.h"
 
 #include <Carbon/Carbon.h>  // kVK_Return
 #include "app/gfx/font.h"
 #include "app/resource_bundle.h"
 #include "base/clipboard.h"
@@ skipping 433 matching lines @@
   } else {
     SetText(GetText());
   }
 }
 
 void AutocompleteEditViewMac::OnTemporaryTextMaybeChanged(
     const std::wstring& display_text, bool save_original_selection) {
   // TODO(shess): I believe this is for when the user arrows around
   // the popup, will be restored if they hit escape.  Figure out if
   // that is for certain it.
-  if (save_original_selection) {
+  if (save_original_selection)
     saved_temporary_selection_ = GetSelectedRange();
-    saved_temporary_text_ = GetText();
-  }
 
   SetWindowTextAndCaretPos(display_text, display_text.size());
   controller_->OnChanged();
 }
 
 bool AutocompleteEditViewMac::OnInlineAutocompleteTextMaybeChanged(
     const std::wstring& display_text, size_t user_text_length) {
   // TODO(shess): Make sure that this actually works.  The round trip
   // to native form and back may mean that it's the same but not the
   // same.
   if (display_text == GetText()) {
     return false;
   }
 
   DCHECK_LE(user_text_length, display_text.size());
   const NSRange range = NSMakeRange(user_text_length, display_text.size());
   SetTextAndSelectedRange(display_text, range);
   controller_->OnChanged();
 
   return true;
 }
 
 void AutocompleteEditViewMac::OnRevertTemporaryText() {
-  SetTextAndSelectedRange(saved_temporary_text_, saved_temporary_selection_);
-  saved_temporary_text_.clear();
+  SetSelectedRange(saved_temporary_selection_);
 }
 
 bool AutocompleteEditViewMac::IsFirstResponder() const {
   return [field_ currentEditor] != nil ? true : false;
 }
 
 void AutocompleteEditViewMac::OnBeforePossibleChange() {
   // We should only arrive here when the field is focussed.
   DCHECK(IsFirstResponder());
 
@@ skipping 354 matching lines @@
 // prepended and ".com" appended.  This calls down to
 // AutocompleteEditModel::OnControlKeyChanged() so that it can change
 // the popup to reflect this.  See autocomplete_edit.cc
 // OnControlKeyChanged() and OnAfterPossibleChange().
 - (void)control:(NSControl*)control flagsChanged:(NSEvent*)theEvent {
   bool controlFlag = ([theEvent modifierFlags]&NSControlKeyMask) != 0;
   edit_view_->OnControlKeyChanged(controlFlag);
 }
 
 @end