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

Side by Side Diff: chrome/browser/prerender/prerender_contents.h

Issue 6543010: Revert 75393 - Cancel prerender if any of the visited URLs are https.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_PRERENDER_PRERENDER_CONTENTS_H_ 5 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
6 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 6 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 // Message handlers. 182 // Message handlers.
183 void OnDidStartProvisionalLoadForFrame(int64 frame_id, 183 void OnDidStartProvisionalLoadForFrame(int64 frame_id,
184 bool main_frame, 184 bool main_frame,
185 const GURL& url); 185 const GURL& url);
186 void OnDidRedirectProvisionalLoad(int32 page_id, 186 void OnDidRedirectProvisionalLoad(int32 page_id,
187 const GURL& source_url, 187 const GURL& source_url,
188 const GURL& target_url); 188 const GURL& target_url);
189 189
190 void OnUpdateFavIconURL(int32 page_id, const GURL& icon_url); 190 void OnUpdateFavIconURL(int32 page_id, const GURL& icon_url);
191 191
192 // Adds an alias URL, for one of the many redirections. Returns whether 192 void AddAliasURL(const GURL& url);
193 // the URL is valid.
194 bool AddAliasURL(const GURL& url);
195 193
196 // Remove |this| from the PrerenderManager, set a final status, and 194 // Remove |this| from the PrerenderManager, set a final status, and
197 // delete |this|. 195 // delete |this|.
198 void Destroy(FinalStatus reason); 196 void Destroy(FinalStatus reason);
199 197
200 // The prerender manager owning this object. 198 // The prerender manager owning this object.
201 PrerenderManager* prerender_manager_; 199 PrerenderManager* prerender_manager_;
202 200
203 // The host for our HTML content. 201 // The host for our HTML content.
204 RenderViewHost* render_view_host_; 202 RenderViewHost* render_view_host_;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 // the time elapsed from initiating a prerender until the time the 240 // the time elapsed from initiating a prerender until the time the
243 // (potentially only partially) prerendered page is shown to the user. 241 // (potentially only partially) prerendered page is shown to the user.
244 base::TimeTicks load_start_time_; 242 base::TimeTicks load_start_time_;
245 243
246 DISALLOW_COPY_AND_ASSIGN(PrerenderContents); 244 DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
247 }; 245 };
248 246
249 } // prerender 247 } // prerender
250 248
251 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 249 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698