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

Side by Side Diff: chrome/browser/instant/instant_tab.cc

Issue 11889003: Fixing ESC in instant-extended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reworked to send ESC down to JS, added test. 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/instant/instant_tab.h" 5 #include "chrome/browser/instant/instant_tab.h"
6 6
7 #include "chrome/browser/instant/instant_controller.h" 7 #include "chrome/browser/instant/instant_controller.h"
8 8
9 InstantTab::InstantTab(InstantController* controller, 9 InstantTab::InstantTab(InstantController* controller,
10 content::WebContents* contents) 10 content::WebContents* contents)
(...skipping 28 matching lines...) Expand all
39 } 39 }
40 40
41 void InstantTab::SetDisplayInstantResults(bool display_instant_results) { 41 void InstantTab::SetDisplayInstantResults(bool display_instant_results) {
42 client_.SetDisplayInstantResults(display_instant_results); 42 client_.SetDisplayInstantResults(display_instant_results);
43 } 43 }
44 44
45 void InstantTab::UpOrDownKeyPressed(int count) { 45 void InstantTab::UpOrDownKeyPressed(int count) {
46 client_.UpOrDownKeyPressed(count); 46 client_.UpOrDownKeyPressed(count);
47 } 47 }
48 48
49 void InstantTab::EscKeyPressed() {
50 client_.EscKeyPressed();
51 }
52
49 void InstantTab::SetMarginSize(int start, int end) { 53 void InstantTab::SetMarginSize(int start, int end) {
50 client_.SetMarginSize(start, end); 54 client_.SetMarginSize(start, end);
51 } 55 }
52 56
53 void InstantTab::InitializeFonts() { 57 void InstantTab::InitializeFonts() {
54 client_.InitializeFonts(); 58 client_.InitializeFonts();
55 } 59 }
56 60
57 void InstantTab::SetSuggestions( 61 void InstantTab::SetSuggestions(
58 const std::vector<InstantSuggestion>& suggestions) { 62 const std::vector<InstantSuggestion>& suggestions) {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 // The client is a committed tab, navigations will happen as expected. 100 // The client is a committed tab, navigations will happen as expected.
97 } 101 }
98 102
99 void InstantTab::NavigateToURL(const GURL& url, 103 void InstantTab::NavigateToURL(const GURL& url,
100 content::PageTransition transition) { 104 content::PageTransition transition) {
101 controller_->NavigateToURL(url, transition); 105 controller_->NavigateToURL(url, transition);
102 } 106 }
103 107
104 void InstantTab::RenderViewCreated() { 108 void InstantTab::RenderViewCreated() {
105 } 109 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698