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

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

Issue 11785025: Do not commit InstantLoader server redirects till the page supports instant. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 11 months 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_LOADER_H_ 5 #ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
6 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 6 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 scoped_ptr<content::WebContents> contents_; 144 scoped_ptr<content::WebContents> contents_;
145 145
146 const std::string instant_url_; 146 const std::string instant_url_;
147 bool supports_instant_; 147 bool supports_instant_;
148 bool is_pointer_down_from_activate_; 148 bool is_pointer_down_from_activate_;
149 history::HistoryAddPageArgs last_navigation_; 149 history::HistoryAddPageArgs last_navigation_;
150 150
151 // Used to get notifications about renderers coming and going. 151 // Used to get notifications about renderers coming and going.
152 content::NotificationRegistrar registrar_; 152 content::NotificationRegistrar registrar_;
153 153
154 // An expected redirect, needs to be stored since
155 // DidCommitProvisionalLoadForFrame does not contain information if the load
156 // is the result of a redirect.
157 GURL expected_redirect_;
158
154 DISALLOW_COPY_AND_ASSIGN(InstantLoader); 159 DISALLOW_COPY_AND_ASSIGN(InstantLoader);
155 }; 160 };
156 161
157 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_ 162 #endif // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698