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

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

Issue 11466007: Add new IPC for searchbox to pipe SearchBox NavigateContentWindow calls to the browser. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: 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
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_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ 6 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 void StartCapturingKeyStrokes(); 135 void StartCapturingKeyStrokes();
136 136
137 // Invoked by InstantLoader when it has swapped a different WebContents into 137 // Invoked by InstantLoader when it has swapped a different WebContents into
138 // the preview, usually because a prerendered page was navigated to. 138 // the preview, usually because a prerendered page was navigated to.
139 void SwappedWebContents(); 139 void SwappedWebContents();
140 140
141 // Invoked by InstantLoader when the preview gains focus, usually due to the 141 // Invoked by InstantLoader when the preview gains focus, usually due to the
142 // user clicking on it. 142 // user clicking on it.
143 void InstantLoaderContentsFocused(); 143 void InstantLoaderContentsFocused();
144 144
145 // Invoked by the InstantLoader when the instant page wants to commit and
146 // navigate to the speicfied URL.
147 void NavigateToURL(const GURL& url);
148
145 private: 149 private:
146 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); 150 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
147 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); 151 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
148 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh); 152 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh);
149 153
150 // Creates a new loader if necessary, using the instant_url property of the 154 // Creates a new loader if necessary, using the instant_url property of the
151 // |template_url| (for example, if the Instant URL has changed since the last 155 // |template_url| (for example, if the Instant URL has changed since the last
152 // time the loader was created). Returns false if the |template_url| doesn't 156 // time the loader was created). Returns false if the |template_url| doesn't
153 // have a valid Instant URL; true otherwise. 157 // have a valid Instant URL; true otherwise.
154 bool ResetLoader(const TemplateURL* template_url, 158 bool ResetLoader(const TemplateURL* template_url,
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 279
276 // Whether to allow the preview to show search suggestions. In general, the 280 // Whether to allow the preview to show search suggestions. In general, the
277 // preview is allowed to show search suggestions whenever |search_mode_| is 281 // preview is allowed to show search suggestions whenever |search_mode_| is
278 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. 282 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
279 bool allow_preview_to_show_search_suggestions_; 283 bool allow_preview_to_show_search_suggestions_;
280 284
281 DISALLOW_COPY_AND_ASSIGN(InstantController); 285 DISALLOW_COPY_AND_ASSIGN(InstantController);
282 }; 286 };
283 287
284 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ 288 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698