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

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: Fix: Possible race condition in browser test. 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 251 matching lines...) Expand 10 before | Expand all | Expand 10 after
262 262
263 private: 263 private:
264 // Needs to be able to call the constructor. 264 // Needs to be able to call the constructor.
265 friend class PrerenderContentsFactoryImpl; 265 friend class PrerenderContentsFactoryImpl;
266 266
267 friend class PrerenderRenderViewHostObserver; 267 friend class PrerenderRenderViewHostObserver;
268 268
269 // Message handlers. 269 // Message handlers.
270 void OnDidStartProvisionalLoadForFrame(int64 frame_id, 270 void OnDidStartProvisionalLoadForFrame(int64 frame_id,
271 bool main_frame, 271 bool main_frame,
272 bool has_opener_set,
272 const GURL& url); 273 const GURL& url);
273 void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls); 274 void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls);
274 void OnMaybeCancelPrerenderForHTML5Media(); 275 void OnMaybeCancelPrerenderForHTML5Media();
275 276
276 // Returns the RenderViewHost Delegate for this prerender. 277 // Returns the RenderViewHost Delegate for this prerender.
277 RenderViewHostDelegate* GetRenderViewHostDelegate(); 278 RenderViewHostDelegate* GetRenderViewHostDelegate();
278 279
279 // Returns the ProcessMetrics for the render process, if it exists. 280 // Returns the ProcessMetrics for the render process, if it exists.
280 base::ProcessMetrics* MaybeGetProcessMetrics(); 281 base::ProcessMetrics* MaybeGetProcessMetrics();
281 282
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 scoped_ptr<TabContentsWrapper> prerender_contents_; 337 scoped_ptr<TabContentsWrapper> prerender_contents_;
337 338
338 scoped_ptr<PrerenderRenderViewHostObserver> render_view_host_observer_; 339 scoped_ptr<PrerenderRenderViewHostObserver> render_view_host_observer_;
339 340
340 DISALLOW_COPY_AND_ASSIGN(PrerenderContents); 341 DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
341 }; 342 };
342 343
343 } // namespace prerender 344 } // namespace prerender
344 345
345 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 346 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698