Fixing ESC in instant-extended.

chrome/browser/ui/views/omnibox/omnibox_view_win.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/views/omnibox/omnibox_view_win.h"
 
 #include <algorithm>
 #include <locale>
 #include <string>
 
@@ skipping 842 matching lines @@
 void OmniboxViewWin::InsertText(int position, const string16& text) {
   DCHECK((position >= 0) && (position <= GetTextLength()));
   ScopedFreeze freeze(this, GetTextObjectModel());
   OnBeforePossibleChange();
   SetSelection(position, position);
   ReplaceSel(text.c_str());
   OnAfterPossibleChange();
 }
 
 void OmniboxViewWin::OnTemporaryTextMaybeChanged(const string16& display_text,
-                                                 bool save_original_selection) {
+                                                 bool save_original_selection,
+                                                 bool notify_text_changed) {
   if (save_original_selection)
     GetSelection(original_selection_);
 
   // Set new text and cursor position.  Sometimes this does extra work (e.g.
   // when the new text and the old text are identical), but it's only called
   // when the user manually changes the selected line in the popup, so that's
   // not really a problem.  Also, even when the text hasn't changed we'd want to
   // update the caret, because if the user had the cursor in the middle of the
   // text and then arrowed to another entry with the same text, we'd still want
   // to move the caret.
   ScopedFreeze freeze(this, GetTextObjectModel());
-  SetWindowTextAndCaretPos(display_text, display_text.length(), false, true);
+  SetWindowTextAndCaretPos(display_text, display_text.length(), false,
+                           notify_text_changed);
 }
 
 bool OmniboxViewWin::OnInlineAutocompleteTextMaybeChanged(
     const string16& display_text,
     size_t user_text_length) {
   // Update the text and selection.  Because this can be called repeatedly while
   // typing, we've careful not to freeze the edit unless we really need to.
   // Also, unlike in the temporary text case above, here we don't want to update
   // the caret/selection unless we have to, since this might make the user's
   // caret position change without warning during typing.
   if (display_text == GetText())
     return false;
 
   ScopedFreeze freeze(this, GetTextObjectModel());
   SetWindowText(display_text.c_str());
   // Set a reversed selection to keep the caret in the same position, which
   // avoids scrolling the user's text.
   SetSelection(static_cast<LONG>(display_text.length()),
                static_cast<LONG>(user_text_length));
   TextChanged();
   return true;
 }
 
 void OmniboxViewWin::OnRevertTemporaryText() {
   SetSelectionRange(original_selection_);
-  TextChanged();
 }
 
 void OmniboxViewWin::OnBeforePossibleChange() {
   // Record our state.
   text_before_change_ = GetText();
   GetSelection(sel_before_change_);
 }
 
 bool OmniboxViewWin::OnAfterPossibleChange() {
   return OnAfterPossibleChangeInternal(false);
@@ skipping 1934 matching lines @@
   return (rect.left - client_rect.left) + (client_rect.right - rect.right);
 }
 
 int OmniboxViewWin::WidthNeededToDisplay(const string16& text) const {
   // Use font_.GetStringWidth() instead of
   // PosFromChar(location_entry_->GetTextLength()) because PosFromChar() is
   // apparently buggy. In both LTR UI and RTL UI with left-to-right layout,
   // PosFromChar(i) might return 0 when i is greater than 1.
   return font_.GetStringWidth(text) + GetHorizontalMargin();
 }