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

Side by Side Diff: chrome/browser/instant/instant_loader.h

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 #ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
6 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 6 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 size_t selection_end, 96 size_t selection_end,
97 bool verbatim); 97 bool verbatim);
98 void Submit(const string16& text); 98 void Submit(const string16& text);
99 void Cancel(const string16& text); 99 void Cancel(const string16& text);
100 void SetPopupBounds(const gfx::Rect& bounds); 100 void SetPopupBounds(const gfx::Rect& bounds);
101 void SetMarginSize(int start, int end); 101 void SetMarginSize(int start, int end);
102 void InitializeFonts(); 102 void InitializeFonts();
103 void SendAutocompleteResults( 103 void SendAutocompleteResults(
104 const std::vector<InstantAutocompleteResult>& results); 104 const std::vector<InstantAutocompleteResult>& results);
105 void UpOrDownKeyPressed(int count); 105 void UpOrDownKeyPressed(int count);
106 void EscKeyPressed();
106 void SearchModeChanged(const chrome::search::Mode& mode); 107 void SearchModeChanged(const chrome::search::Mode& mode);
107 void SendThemeBackgroundInfo(const ThemeBackgroundInfo& theme_info); 108 void SendThemeBackgroundInfo(const ThemeBackgroundInfo& theme_info);
108 void SendThemeAreaHeight(int height); 109 void SendThemeAreaHeight(int height);
109 void SetDisplayInstantResults(bool display_instant_results); 110 void SetDisplayInstantResults(bool display_instant_results);
110 void KeyCaptureChanged(bool is_key_capture_enabled); 111 void KeyCaptureChanged(bool is_key_capture_enabled);
111 112
112 private: 113 private:
113 class WebContentsDelegateImpl; 114 class WebContentsDelegateImpl;
114 115
115 // Overridden from InstantClient::Delegate: 116 // Overridden from InstantClient::Delegate:
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 bool is_pointer_down_from_activate_; 151 bool is_pointer_down_from_activate_;
151 history::HistoryAddPageArgs last_navigation_; 152 history::HistoryAddPageArgs last_navigation_;
152 153
153 // Used to get notifications about renderers coming and going. 154 // Used to get notifications about renderers coming and going.
154 content::NotificationRegistrar registrar_; 155 content::NotificationRegistrar registrar_;
155 156
156 DISALLOW_COPY_AND_ASSIGN(InstantLoader); 157 DISALLOW_COPY_AND_ASSIGN(InstantLoader);
157 }; 158 };
158 159
159 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 160 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698