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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/instant/instant_controller.cc

Issue 11889003: Fixing ESC in instant-extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor correction to 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
« no previous file with comments | « chrome/browser/instant/instant_controller.h ('k') | chrome/browser/instant/instant_extended_browsertest.cc » ('j') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index 80f9b796a4cf181a57ac371c9af2bab3abe1c1df..8090a3e8ebbf2507b6c80159ffeaa927e1531c83 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -509,6 +509,21 @@ bool InstantController::OnUpOrDownKeyPressed(int count) {
return true;
}
+bool InstantController::OnCancel() {
+ if (!extended_enabled_)
+ return false;
+
+ if (!instant_tab_ && !overlay_)
+ return false;
+
+ if (instant_tab_)
+ instant_tab_->EscKeyPressed();
+ else
+ overlay_->EscKeyPressed();
+
+ return true;
+}
+
content::WebContents* InstantController::GetPreviewContents() const {
return overlay_ ? overlay_->contents() : NULL;
}
« no previous file with comments | « chrome/browser/instant/instant_controller.h ('k') | chrome/browser/instant/instant_extended_browsertest.cc » ('j') | chrome/browser/ui/omnibox/omnibox_edit_model.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698