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

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: Remove extra ; 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
« no previous file with comments | « chrome/browser/instant/instant_client.cc ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 // Invoked by InstantLoader when the preview gains focus, usually due to the 147 // Invoked by InstantLoader when the preview gains focus, usually due to the
148 // user clicking on it. 148 // user clicking on it.
149 void InstantLoaderContentsFocused(); 149 void InstantLoaderContentsFocused();
150 150
151 // Invoked by the InstantLoader when its RenderView crashes. 151 // Invoked by the InstantLoader when its RenderView crashes.
152 void InstantLoaderRenderViewGone(); 152 void InstantLoaderRenderViewGone();
153 153
154 // Invoked by InstantLoader when the instant page is about to navigate. 154 // Invoked by InstantLoader when the instant page is about to navigate.
155 void InstantLoaderAboutToNavigateMainFrame(const GURL& url); 155 void InstantLoaderAboutToNavigateMainFrame(const GURL& url);
156 156
157 // Invoked by the InstantLoader when the instant page wants to navigate to
158 // the speicfied URL.
159 void NavigateToURL(const GURL& url, content::PageTransition transition);
160
157 private: 161 private:
158 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); 162 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
159 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); 163 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
160 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh); 164 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh);
161 165
162 // Helper for OmniboxFocusChanged. Commit or discard the preview. 166 // Helper for OmniboxFocusChanged. Commit or discard the preview.
163 void OmniboxLostFocus(gfx::NativeView view_gaining_focus); 167 void OmniboxLostFocus(gfx::NativeView view_gaining_focus);
164 168
165 // Creates a new loader if necessary, using the instant_url property of the 169 // Creates a new loader if necessary, using the instant_url property of the
166 // |template_url| (for example, if the Instant URL has changed since the last 170 // |template_url| (for example, if the Instant URL has changed since the last
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 295
292 // Whether to allow the preview to show search suggestions. In general, the 296 // Whether to allow the preview to show search suggestions. In general, the
293 // preview is allowed to show search suggestions whenever |search_mode_| is 297 // preview is allowed to show search suggestions whenever |search_mode_| is
294 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. 298 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
295 bool allow_preview_to_show_search_suggestions_; 299 bool allow_preview_to_show_search_suggestions_;
296 300
297 DISALLOW_COPY_AND_ASSIGN(InstantController); 301 DISALLOW_COPY_AND_ASSIGN(InstantController);
298 }; 302 };
299 303
300 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ 304 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_client.cc ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698