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

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

Issue 6915019: Changes to not use the prerendered contents when window.opener needs to be set. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 7 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 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 249
250 const GURL& prerender_url() const { return prerender_url_; } 250 const GURL& prerender_url() const { return prerender_url_; }
251 251
252 private: 252 private:
253 // Needs to be able to call the constructor. 253 // Needs to be able to call the constructor.
254 friend class PrerenderContentsFactoryImpl; 254 friend class PrerenderContentsFactoryImpl;
255 255
256 // Message handlers. 256 // Message handlers.
257 void OnDidStartProvisionalLoadForFrame(int64 frame_id, 257 void OnDidStartProvisionalLoadForFrame(int64 frame_id,
258 bool main_frame, 258 bool main_frame,
259 bool has_opener_set,
259 const GURL& url); 260 const GURL& url);
260 void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls); 261 void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls);
261 void OnMaybeCancelPrerenderForHTML5Media(); 262 void OnMaybeCancelPrerenderForHTML5Media();
262 263
263 // Remove |this| from the PrerenderManager, set a final status, and 264 // Remove |this| from the PrerenderManager, set a final status, and
264 // delete |this|. 265 // delete |this|.
265 void Destroy(FinalStatus reason); 266 void Destroy(FinalStatus reason);
266 267
267 // Returns the RenderViewHost Delegate for this prerender. 268 // Returns the RenderViewHost Delegate for this prerender.
268 RenderViewHostDelegate* GetRenderViewHostDelegate(); 269 RenderViewHostDelegate* GetRenderViewHostDelegate();
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 326
326 // The prerendered TabContents; may be null. 327 // The prerendered TabContents; may be null.
327 scoped_ptr<TabContentsWrapper> prerender_contents_; 328 scoped_ptr<TabContentsWrapper> prerender_contents_;
328 329
329 DISALLOW_COPY_AND_ASSIGN(PrerenderContents); 330 DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
330 }; 331 };
331 332
332 } // namespace prerender 333 } // namespace prerender
333 334
334 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 335 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698