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

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

Issue 11416187: Commit instant loader when the instant page navigates away from instant URL. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixing issue caused due to removal of TabContents. 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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 its RenderView crashes. 145 // Invoked by the InstantLoader when its RenderView crashes.
146 void InstantLoaderRenderViewGone(); 146 void InstantLoaderRenderViewGone();
147 147
148 // Invoked by InstantLoader when the instant page is about to navigate.
149 void InstantLoaderAboutToNavigateMainFrame(const GURL& url);
150
148 private: 151 private:
149 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant); 152 FRIEND_TEST_ALL_PREFIXES(InstantTest, OmniboxFocusLoadsInstant);
150 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider); 153 FRIEND_TEST_ALL_PREFIXES(InstantTest, NonInstantSearchProvider);
151 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh); 154 FRIEND_TEST_ALL_PREFIXES(InstantTest, InstantLoaderRefresh);
152 155
153 // Creates a new loader if necessary, using the instant_url property of the 156 // Creates a new loader if necessary, using the instant_url property of the
154 // |template_url| (for example, if the Instant URL has changed since the last 157 // |template_url| (for example, if the Instant URL has changed since the last
155 // time the loader was created). Returns false if the |template_url| doesn't 158 // time the loader was created). Returns false if the |template_url| doesn't
156 // have a valid Instant URL; true otherwise. 159 // have a valid Instant URL; true otherwise.
157 bool ResetLoader(const TemplateURL* template_url, 160 bool ResetLoader(const TemplateURL* template_url,
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 282
280 // Whether to allow the preview to show search suggestions. In general, the 283 // Whether to allow the preview to show search suggestions. In general, the
281 // preview is allowed to show search suggestions whenever |search_mode_| is 284 // preview is allowed to show search suggestions whenever |search_mode_| is
282 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false. 285 // MODE_SEARCH_SUGGESTIONS, except in those cases where this is false.
283 bool allow_preview_to_show_search_suggestions_; 286 bool allow_preview_to_show_search_suggestions_;
284 287
285 DISALLOW_COPY_AND_ASSIGN(InstantController); 288 DISALLOW_COPY_AND_ASSIGN(InstantController);
286 }; 289 };
287 290
288 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_ 291 #endif // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_commit_type.h ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698