Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3445)

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_view_win.cc

Issue 11889003: Fixing ESC in instant-extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverted back to asvitkine's fix. REALLY answered PK's comments. :) Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/omnibox/omnibox_view_win.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
index 111e1cc538cd7319b08cd680065b4c390e83f454..2723d93aa87cba3d3b640d10ea8691f98f8f819c 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_win.cc
@@ -860,7 +860,8 @@ void OmniboxViewWin::InsertText(int position, const string16& text) {
}
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_);
@@ -872,7 +873,8 @@ void OmniboxViewWin::OnTemporaryTextMaybeChanged(const string16& display_text,
// 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(
@@ -898,7 +900,6 @@ bool OmniboxViewWin::OnInlineAutocompleteTextMaybeChanged(
void OmniboxViewWin::OnRevertTemporaryText() {
SetSelectionRange(original_selection_);
- TextChanged();
}
void OmniboxViewWin::OnBeforePossibleChange() {

Powered by Google App Engine
This is Rietveld 408576698