Fixing ESC in instant-extended.

chrome/renderer/searchbox/searchbox.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/renderer/searchbox/searchbox.h"
 
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/searchbox/searchbox_extension.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
@@ skipping 104 matching lines @@
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSubmit, OnSubmit)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxCancel, OnCancel)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxPopupResize, OnPopupResize)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxMarginChange, OnMarginChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_DetermineIfPageSupportsInstant,
                         OnDetermineIfPageSupportsInstant)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxAutocompleteResults,
                         OnAutocompleteResults)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxUpOrDownKeyPressed,
                         OnUpOrDownKeyPressed)
+    IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxCancelSelection,
+                        OnCancelSelection)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxModeChanged,
                         OnModeChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxSetDisplayInstantResults,
                         OnSetDisplayInstantResults)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxKeyCaptureChanged,
                         OnKeyCaptureChange)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxThemeChanged,
                         OnThemeChanged)
     IPC_MESSAGE_HANDLER(ChromeViewMsg_SearchBoxThemeAreaHeightChanged,
                         OnThemeAreaHeightChanged)
@@ skipping 87 matching lines @@
 }
 
 void SearchBox::OnUpOrDownKeyPressed(int count) {
   if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     DVLOG(1) << render_view() << " OnKeyPress: " << count;
     extensions_v8::SearchBoxExtension::DispatchUpOrDownKeyPress(
         render_view()->GetWebView()->mainFrame(), count);
   }
 }
 
+void SearchBox::OnCancelSelection(const string16& query) {
+  // TODO(sreeram): The state reset below are somewhat wrong. Fix them.

[palmer, 2013/02/13 21:27:54]

I believe it is better to cite a bug # in TODOs.

[beaudoin, 2013/02/13 21:32:38]

Done.

[Peter Kasting, 2013/02/14 21:17:50]

Actually, I ask all my reviewees to not cite bug numbers in comments.  The
comment should give the complete context for the issue on its own.  Linking to
bugs is hazardous, in particular when the bug metastasizes and someone trying to
read it isn't sure what the relevant portion is for the source code in question
any more, and even when that doesn't happen, it's inconvenient to have to go
find and read another bug rather than having all the data there (or to read the
other bug only to find it adds nothing to the comment).

+  query_ = query;
+  verbatim_ = true;
+  selection_start_ = selection_end_ = query_.size();
+  if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
+    DVLOG(1) << render_view() << " OnKeyPress ESC";
+    extensions_v8::SearchBoxExtension::DispatchEscKeyPress(
+        render_view()->GetWebView()->mainFrame());
+  }
+}
+
 void SearchBox::OnKeyCaptureChange(bool is_key_capture_enabled) {
   if (is_key_capture_enabled != is_key_capture_enabled_ &&
       render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
     is_key_capture_enabled_ = is_key_capture_enabled;
     DVLOG(1) << render_view() << " OnKeyCaptureChange";
     extensions_v8::SearchBoxExtension::DispatchKeyCaptureChange(
         render_view()->GetWebView()->mainFrame());
   }
 }
 
@@ skipping 55 matching lines @@
   is_key_capture_enabled_ = false;
   mode_ = chrome::search::Mode();
   theme_info_ = ThemeBackgroundInfo();
   theme_area_height_ = 0;
   // Don't reset display_instant_results_ to prevent clearing it on committed
   // results pages in extended mode. Otherwise resetting it is a no-op because
   // a new loader is created when it changes; see crbug.com/164662.
   // Also don't reset omnibox_font_ or omnibox_font_size_ since it never
   // changes.
 }