OLD | NEW |
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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 void SwappedWebContents(); | 159 void SwappedWebContents(); |
160 | 160 |
161 // Invoked by InstantLoader when the preview gains focus, usually due to the | 161 // Invoked by InstantLoader when the preview gains focus, usually due to the |
162 // user clicking on it. | 162 // user clicking on it. |
163 void InstantLoaderContentsFocused(); | 163 void InstantLoaderContentsFocused(); |
164 | 164 |
165 // Invoked by the InstantLoader when its RenderView crashes. | 165 // Invoked by the InstantLoader when its RenderView crashes. |
166 void InstantLoaderRenderViewGone(); | 166 void InstantLoaderRenderViewGone(); |
167 | 167 |
168 // Invoked by InstantLoader when the instant page is about to navigate. | 168 // Invoked by InstantLoader when the instant page is about to navigate. |
169 void InstantLoaderAboutToNavigateMainFrame(const GURL& url); | 169 void InstantLoaderAboutToNavigateMainFrame(const GURL& url, |
| 170 bool is_server_redirect); |
170 | 171 |
171 // Invoked by the InstantLoader when the instant page wants to navigate to | 172 // Invoked by the InstantLoader when the instant page wants to navigate to |
172 // the speicfied URL. | 173 // the speicfied URL. |
173 void NavigateToURL(const GURL& url, content::PageTransition transition); | 174 void NavigateToURL(const GURL& url, content::PageTransition transition); |
174 | 175 |
175 private: | 176 private: |
176 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); | 177 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); |
177 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); | 178 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); |
178 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh); | 179 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh); |
179 | 180 |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
321 | 322 |
322 // Whether to allow the preview to show search suggestions. In general, the | 323 // Whether to allow the preview to show search suggestions. In general, the |
323 // preview is allowed to show search suggestions whenever |search_mode_| is | 324 // preview is allowed to show search suggestions whenever |search_mode_| is |
324 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. | 325 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. |
325 bool allow_preview_to_show_search_suggestions_; | 326 bool allow_preview_to_show_search_suggestions_; |
326 | 327 |
327 DISALLOW_COPY_AND_ASSIGN(InstantController); | 328 DISALLOW_COPY_AND_ASSIGN(InstantController); |
328 }; | 329 }; |
329 | 330 |
330 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ | 331 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ |
OLD | NEW |