Fixing ESC in instant-extended.

chrome/browser/instant/instant_controller.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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 491 matching lines @@
     return false;
 
   if (instant_tab_)
     instant_tab_->UpOrDownKeyPressed(count);
   else
     overlay_->UpOrDownKeyPressed(count);
 
   return true;
 }
 
+void InstantController::OnCancel(const AutocompleteMatch& match,
+                                 const string16& full_text) {
+  if (!extended_enabled_)
+    return;
+
+  if (!instant_tab_ && !overlay_)
+    return;
+
+  // We manually reset the state here since the JS is not expected to do it.
+  // TODO(sreeram): Handle the case where user_text is now a URL
+  last_match_was_search_ = AutocompleteMatch::IsSearchType(match.type) &&
+                           !full_text.empty();
+  last_omnibox_text_ = full_text;
+  last_suggestion_ = InstantSuggestion();
+
+  if (instant_tab_)
+    instant_tab_->CancelSelection(full_text);
+  else
+    overlay_->CancelSelection(full_text);
+}
+
 content::WebContents* InstantController::GetPreviewContents() const {
   return overlay_ ? overlay_->contents() : NULL;
 }
 
 bool InstantController::IsPreviewingSearchResults() const {
   return model_.mode().is_search_suggestions() && IsFullHeight(model_) &&
          (last_match_was_search_ ||
           last_suggestion_.behavior == INSTANT_COMPLETE_NEVER);
 }
 
 bool InstantController::CommitIfPossible(InstantCommitType type) {
   if (!extended_enabled_ && !instant_enabled_)
     return false;
-

[sreeram, 2013/02/14 17:56:41]

Nit: Don't remove this blank line.

   LOG_INSTANT_DEBUG_EVENT(this, base::StringPrintf(
       "CommitIfPossible: type=%d last_omnibox_text_='%s' "
       "last_match_was_search_=%d instant_tab_=%d", type,
       UTF16ToUTF8(last_omnibox_text_).c_str(), last_match_was_search_,
       instant_tab_ != NULL));
 
   // If we are on an already committed search results page, send a submit event
   // to the page, but otherwise, nothing else to do.
   if (instant_tab_) {
     if (type == INSTANT_COMMIT_PRESSED_ENTER &&
@@ skipping 862 matching lines @@
   delete overlay_->ReleaseContents().release();
   MessageLoop::current()->DeleteSoon(FROM_HERE, overlay_.release());
   EnsureOverlayIsCurrent(false);
 }
 
 void InstantController::RemoveFromBlacklist(const std::string& url) {
   if (blacklisted_urls_.erase(url)) {
     RecordEventHistogram(INSTANT_CONTROLLER_EVENT_URL_REMOVED_FROM_BLACKLIST);
   }
 }