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

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: Kittens live! 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 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 112
113 void SearchBox::OnChange(const string16& query, 113 void SearchBox::OnChange(const string16& query,
114 bool verbatim, 114 bool verbatim,
115 size_t selection_start, 115 size_t selection_start,
116 size_t selection_end) { 116 size_t selection_end) {
117 query_ = query; 117 query_ = query;
118 verbatim_ = verbatim; 118 verbatim_ = verbatim;
119 selection_start_ = selection_start; 119 selection_start_ = selection_start;
120 selection_end_ = selection_end; 120 selection_end_ = selection_end;
121 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 121 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
122 DVLOG(1) << render_view() << " OnChange";
122 extensions_v8::SearchBoxExtension::DispatchChange( 123 extensions_v8::SearchBoxExtension::DispatchChange(
123 render_view()->GetWebView()->mainFrame()); 124 render_view()->GetWebView()->mainFrame());
124 } 125 }
125 } 126 }
126 127
127 void SearchBox::OnSubmit(const string16& query) { 128 void SearchBox::OnSubmit(const string16& query) {
128 query_ = query; 129 query_ = query;
129 verbatim_ = true; 130 verbatim_ = true;
130 selection_start_ = selection_end_ = query_.size(); 131 selection_start_ = selection_end_ = query_.size();
131 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 132 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
133 DVLOG(1) << render_view() << " OnSubmit";
132 extensions_v8::SearchBoxExtension::DispatchSubmit( 134 extensions_v8::SearchBoxExtension::DispatchSubmit(
133 render_view()->GetWebView()->mainFrame()); 135 render_view()->GetWebView()->mainFrame());
134 } 136 }
135 Reset(); 137 Reset();
136 } 138 }
137 139
138 void SearchBox::OnCancel(const string16& query) { 140 void SearchBox::OnCancel(const string16& query) {
139 query_ = query; 141 query_ = query;
140 verbatim_ = true; 142 verbatim_ = true;
141 selection_start_ = selection_end_ = query_.size(); 143 selection_start_ = selection_end_ = query_.size();
142 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 144 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
145 DVLOG(1) << render_view() << " OnCancel";
143 extensions_v8::SearchBoxExtension::DispatchCancel( 146 extensions_v8::SearchBoxExtension::DispatchCancel(
144 render_view()->GetWebView()->mainFrame()); 147 render_view()->GetWebView()->mainFrame());
145 } 148 }
146 Reset(); 149 Reset();
147 } 150 }
148 151
149 void SearchBox::OnResize(const gfx::Rect& bounds) { 152 void SearchBox::OnResize(const gfx::Rect& bounds) {
150 rect_ = bounds; 153 rect_ = bounds;
151 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 154 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
155 DVLOG(1) << render_view() << " OnResize";
152 extensions_v8::SearchBoxExtension::DispatchResize( 156 extensions_v8::SearchBoxExtension::DispatchResize(
153 render_view()->GetWebView()->mainFrame()); 157 render_view()->GetWebView()->mainFrame());
154 } 158 }
155 } 159 }
156 160
157 void SearchBox::OnDetermineIfPageSupportsInstant() { 161 void SearchBox::OnDetermineIfPageSupportsInstant() {
158 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 162 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
159 bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant( 163 bool result = extensions_v8::SearchBoxExtension::PageSupportsInstant(
160 render_view()->GetWebView()->mainFrame()); 164 render_view()->GetWebView()->mainFrame());
165 DVLOG(1) << render_view() << " PageSupportsInstant: " << result;
161 render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined( 166 render_view()->Send(new ChromeViewHostMsg_InstantSupportDetermined(
162 render_view()->GetRoutingID(), render_view()->GetPageId(), result)); 167 render_view()->GetRoutingID(), render_view()->GetPageId(), result));
163 } 168 }
164 } 169 }
165 170
166 void SearchBox::OnAutocompleteResults( 171 void SearchBox::OnAutocompleteResults(
167 const std::vector<InstantAutocompleteResult>& results) { 172 const std::vector<InstantAutocompleteResult>& results) {
168 results_base_ += autocomplete_results_.size(); 173 results_base_ += autocomplete_results_.size();
169 autocomplete_results_ = results; 174 autocomplete_results_ = results;
170 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 175 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
176 DVLOG(1) << render_view() << " OnAutocompleteResults";
171 extensions_v8::SearchBoxExtension::DispatchAutocompleteResults( 177 extensions_v8::SearchBoxExtension::DispatchAutocompleteResults(
172 render_view()->GetWebView()->mainFrame()); 178 render_view()->GetWebView()->mainFrame());
173 } 179 }
174 } 180 }
175 181
176 void SearchBox::OnUpOrDownKeyPressed(int count) { 182 void SearchBox::OnUpOrDownKeyPressed(int count) {
177 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 183 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
184 DVLOG(1) << render_view() << " OnKeyPress: " << count;
178 extensions_v8::SearchBoxExtension::DispatchUpOrDownKeyPress( 185 extensions_v8::SearchBoxExtension::DispatchUpOrDownKeyPress(
179 render_view()->GetWebView()->mainFrame(), count); 186 render_view()->GetWebView()->mainFrame(), count);
180 } 187 }
181 } 188 }
182 189
183 void SearchBox::OnModeChanged(const chrome::search::Mode& mode) { 190 void SearchBox::OnModeChanged(const chrome::search::Mode& mode) {
184 mode_ = mode; 191 mode_ = mode;
185 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 192 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
193 DVLOG(1) << render_view() << " OnModeChanged";
186 extensions_v8::SearchBoxExtension::DispatchContextChange( 194 extensions_v8::SearchBoxExtension::DispatchContextChange(
187 render_view()->GetWebView()->mainFrame()); 195 render_view()->GetWebView()->mainFrame());
188 } 196 }
189 } 197 }
190 198
191 void SearchBox::OnThemeChanged(const ThemeBackgroundInfo& theme_info) { 199 void SearchBox::OnThemeChanged(const ThemeBackgroundInfo& theme_info) {
192 theme_info_ = theme_info; 200 theme_info_ = theme_info;
193 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) { 201 if (render_view()->GetWebView() && render_view()->GetWebView()->mainFrame()) {
194 extensions_v8::SearchBoxExtension::DispatchThemeChange( 202 extensions_v8::SearchBoxExtension::DispatchThemeChange(
195 render_view()->GetWebView()->mainFrame()); 203 render_view()->GetWebView()->mainFrame());
(...skipping 13 matching lines...) Expand all
209 verbatim_ = false; 217 verbatim_ = false;
210 selection_start_ = 0; 218 selection_start_ = 0;
211 selection_end_ = 0; 219 selection_end_ = 0;
212 results_base_ = 0; 220 results_base_ = 0;
213 rect_ = gfx::Rect(); 221 rect_ = gfx::Rect();
214 autocomplete_results_.clear(); 222 autocomplete_results_.clear();
215 mode_ = chrome::search::Mode(); 223 mode_ = chrome::search::Mode();
216 theme_info_ = ThemeBackgroundInfo(); 224 theme_info_ = ThemeBackgroundInfo();
217 theme_area_height_ = 0; 225 theme_area_height_ = 0;
218 } 226 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698