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

Side by Side Diff: chrome/renderer/searchbox/searchbox.cc

Issue 11421079: Persist the Instant API to committed search result pages. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More fixes Created 8 years 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 (c) 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/renderer/searchbox/searchbox.h" 5 #include "chrome/renderer/searchbox/searchbox.h"
6 6
7 #include "chrome/common/render_messages.h" 7 #include "chrome/common/render_messages.h"
8 #include "chrome/renderer/searchbox/searchbox_extension.h" 8 #include "chrome/renderer/searchbox/searchbox_extension.h"
9 #include "content/public/renderer/render_view.h" 9 #include "content/public/renderer/render_view.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
11 11
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 115
116 void SearchBox::OnChange(const string16& query, 116 void SearchBox::OnChange(const string16& query,
117 bool verbatim, 117 bool verbatim,
118 size_t selection_start, 118 size_t selection_start,
119 size_t selection_end) { 119 size_t selection_end) {
120 query_ = query; 120 query_ = query;
121 verbatim_ = verbatim; 121 verbatim_ = verbatim;
122 selection_start_ = selection_start; 122 selection_start_ = selection_start;
123 selection_end_ = selection_end; 123 selection_end_ = selection_end;
124 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 124 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
125 DVLOG(1) << render_view() << " OnChange";
125 extensions_v8::SearchBoxExtension::DispatchChange( 126 extensions_v8::SearchBoxExtension::DispatchChange(
126 render_view()->GetWebView()->mainFrame()); 127 render_view()->GetWebView()->mainFrame());
127 } 128 }
128 } 129 }
129 130
130 void SearchBox::OnSubmit(const string16& query) { 131 void SearchBox::OnSubmit(const string16& query) {
131 query_ = query; 132 query_ = query;
132 verbatim_ = true; 133 verbatim_ = true;
133 selection_start_ = selection_end_ = query_.size(); 134 selection_start_ = selection_end_ = query_.size();
134 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 135 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
136 DVLOG(1) << render_view() << " OnSubmit";
135 extensions_v8::SearchBoxExtension::DispatchSubmit( 137 extensions_v8::SearchBoxExtension::DispatchSubmit(
136 render_view()->GetWebView()->mainFrame()); 138 render_view()->GetWebView()->mainFrame());
137 } 139 }
138 Reset(); 140 Reset();
139 } 141 }
140 142
141 void SearchBox::OnCancel(const string16& query) { 143 void SearchBox::OnCancel(const string16& query) {
142 query_ = query; 144 query_ = query;
143 verbatim_ = true; 145 verbatim_ = true;
144 selection_start_ = selection_end_ = query_.size(); 146 selection_start_ = selection_end_ = query_.size();
145 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 147 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
148 DVLOG(1) << render_view() << " OnCancel";
146 extensions_v8::SearchBoxExtension::DispatchCancel( 149 extensions_v8::SearchBoxExtension::DispatchCancel(
147 render_view()->GetWebView()->mainFrame()); 150 render_view()->GetWebView()->mainFrame());
148 } 151 }
149 Reset(); 152 Reset();
150 } 153 }
151 154
152 void SearchBox::OnResize(const gfx::Rect& bounds) { 155 void SearchBox::OnResize(const gfx::Rect& bounds) {
153 rect_ = bounds; 156 rect_ = bounds;
154 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 157 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
158 DVLOG(1) << render_view() << " OnResize";
155 extensions_v8::SearchBoxExtension::DispatchResize( 159 extensions_v8::SearchBoxExtension::DispatchResize(
156 render_view()->GetWebView()->mainFrame()); 160 render_view()->GetWebView()->mainFrame());
157 } 161 }
158 } 162 }
159 163
160 void SearchBox::OnDetermineIfPageSupportsInstant() { 164 void SearchBox::OnDetermineIfPageSupportsInstant() {
161 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 165 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
162 bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant( 166 bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant(
163 render_view()->GetWebView()->mainFrame()); 167 render_view()->GetWebView()->mainFrame());
168 DVLOG(1) << render_view() << " PageSupportsInstant: " << result;
164 render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined( 169 render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined(
165 render_view()->GetRoutingID(), render_view()->GetPageId(), result)); 170 render_view()->GetRoutingID(), render_view()->GetPageId(), result));
166 } 171 }
167 } 172 }
168 173
169 void SearchBox::OnAutocompleteResults( 174 void SearchBox::OnAutocompleteResults(
170 const std::vector<InstantAutocompleteResult>& results) { 175 const std::vector<InstantAutocompleteResult>& results) {
171 results_base_ += autocomplete_results_.size(); 176 results_base_ += autocomplete_results_.size();
172 autocomplete_results_ = results; 177 autocomplete_results_ = results;
173 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 178 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
179 DVLOG(1) << render_view() << " OnAutocompleteResults";
174 extensions_v8::SearchBoxExtension::DispatchAutocompleteResults( 180 extensions_v8::SearchBoxExtension::DispatchAutocompleteResults(
175 render_view()->GetWebView()->mainFrame()); 181 render_view()->GetWebView()->mainFrame());
176 } 182 }
177 } 183 }
178 184
179 void SearchBox::OnUpOrDownKeyPressed(int count) { 185 void SearchBox::OnUpOrDownKeyPressed(int count) {
180 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 186 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
187 DVLOG(1) << render_view() << " OnKeyPress: " << count;
181 extensions_v8::SearchBoxExtension::DispatchUpOrDownKeyPress( 188 extensions_v8::SearchBoxExtension::DispatchUpOrDownKeyPress(
182 render_view()->GetWebView()->mainFrame(), count); 189 render_view()->GetWebView()->mainFrame(), count);
183 } 190 }
184 } 191 }
185 192
186 void SearchBox::OnModeChanged(const chrome::search::Mode& mode) { 193 void SearchBox::OnModeChanged(const chrome::search::Mode& mode) {
187 mode_ = mode; 194 mode_ = mode;
188 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 195 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
196 DVLOG(1) << render_view() << " OnModeChanged";
189 extensions_v8::SearchBoxExtension::DispatchContextChange( 197 extensions_v8::SearchBoxExtension::DispatchContextChange(
190 render_view()->GetWebView()->mainFrame()); 198 render_view()->GetWebView()->mainFrame());
191 } 199 }
192 } 200 }
193 201
194 void SearchBox::OnSetDisplayInstantResults(bool display_instant_results) { 202 void SearchBox::OnSetDisplayInstantResults(bool display_instant_results) {
195 display_instant_results_ = display_instant_results; 203 display_instant_results_ = display_instant_results;
196 } 204 }
197 205
198 void SearchBox::OnThemeChanged(const ThemeBackgroundInfo& theme_info) { 206 void SearchBox::OnThemeChanged(const ThemeBackgroundInfo& theme_info) {
(...skipping 18 matching lines...) Expand all
217 selection_start_ = 0; 225 selection_start_ = 0;
218 selection_end_ = 0; 226 selection_end_ = 0;
219 results_base_ = 0; 227 results_base_ = 0;
220 rect_ = gfx::Rect(); 228 rect_ = gfx::Rect();
221 autocomplete_results_.clear(); 229 autocomplete_results_.clear();
222 mode_ = chrome::search::Mode(); 230 mode_ = chrome::search::Mode();
223 theme_info_ = ThemeBackgroundInfo(); 231 theme_info_ = ThemeBackgroundInfo();
224 theme_area_height_ = 0; 232 theme_area_height_ = 0;
225 display_instant_results_ = false; 233 display_instant_results_ = false;
226 } 234 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698