Fix a variety of omnibox bugs around zerosuggest, the escape key, or both.

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

 // Copyright (c) 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_views.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 799 matching lines @@
   views::Textfield::AboutToRequestFocusFromTabTraversal(reverse);
 }
 
 bool OmniboxViewViews::SkipDefaultKeyEventProcessing(
     const ui::KeyEvent& event) {
   if (views::FocusManager::IsTabTraversalKeyEvent(event) &&
       ((model()->is_keyword_hint() && !event.IsShiftDown()) ||
        model()->popup_model()->IsOpen())) {
     return true;
   }
+  if (event.key_code() == ui::VKEY_ESCAPE)
+    return model()->WillHandleEscapeKey();
   return Textfield::SkipDefaultKeyEventProcessing(event);
 }
 
 void OmniboxViewViews::GetAccessibleState(ui::AXViewState* state) {
   state->role = ui::AX_ROLE_TEXT_FIELD;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
   state->value = GetText();
 
   base::string16::size_type entry_start;
   base::string16::size_type entry_end;
@@ skipping 22 matching lines @@
     saved_selection_for_focus_change_ = gfx::Range::InvalidRange();
   }
 }
 
 void OmniboxViewViews::OnBlur() {
   // Save the user's existing selection to restore it later.
   saved_selection_for_focus_change_ = GetSelectedRange();
 
   views::Textfield::OnBlur();
   model()->OnWillKillFocus();
-  CloseOmniboxPopup();
+
+  // If ZeroSuggest is active, we may have refused to show an update to the
+  // underlying permanent URL that happened while the popup was open, so
+  // revert to ensure that update is shown now.  Otherwise, make sure to call
+  // CloseOmniboxPopup() unconditionally, so that if ZeroSuggest is in the midst
+  // of running but hasn't yet opened the popup, it will be halted.
+  if (!model()->user_input_in_progress() && model()->popup_model()->IsOpen())
+    RevertAll();
+  else
+    CloseOmniboxPopup();
 
   // Tell the model to reset itself.
   model()->OnKillFocus();
 
   // Make sure the beginning of the text is visible.
   SelectRange(gfx::Range(0));
 }
 
 bool OmniboxViewViews::IsCommandIdEnabled(int command_id) const {
   if (command_id == IDS_APP_PASTE)
@@ skipping 177 matching lines @@
     menu_contents->InsertItemWithStringIdAt(
         select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);
   }
 
   // Minor note: We use IDC_ for command id here while the underlying textfield
   // is using IDS_ for all its command ids. This is because views cannot depend
   // on IDC_ for now.
   menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
       IDS_EDIT_SEARCH_ENGINES);
 }