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(string16 query) {

[sreeram, 2013/02/12 20:52:59]

const string16&

[beaudoin, 2013/02/12 21:34:41]

Done.

+  query_ = query;
+  verbatim_ = true;
+  selection_start_ = selection_end_ = query_.size();

[sreeram, 2013/02/12 20:52:59]

Similarly, these are also somewhat wrong. Just add more TODOs to fix them later.

[beaudoin, 2013/02/12 21:34:41]

Done.

+  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.
 }