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

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: Addressing Sreeram's comments. 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 258
259 private: 259 private:
260 // Needs to be able to call the constructor. 260 // Needs to be able to call the constructor.
261 friend class PrerenderContentsFactoryImpl; 261 friend class PrerenderContentsFactoryImpl;
262 262
263 friend class PrerenderRenderViewHostObserver; 263 friend class PrerenderRenderViewHostObserver;
264 264
265 // Message handlers. 265 // Message handlers.
266 void OnDidStartProvisionalLoadForFrame(int64 frame_id, 266 void OnDidStartProvisionalLoadForFrame(int64 frame_id,
267 bool main_frame, 267 bool main_frame,
268 bool has_opener_set,
268 const GURL& url); 269 const GURL& url);
269 void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls); 270 void OnUpdateFaviconURL(int32 page_id, const std::vector<FaviconURL>& urls);
270 void OnMaybeCancelPrerenderForHTML5Media(); 271 void OnMaybeCancelPrerenderForHTML5Media();
271 272
272 // Returns the RenderViewHost Delegate for this prerender. 273 // Returns the RenderViewHost Delegate for this prerender.
273 RenderViewHostDelegate* GetRenderViewHostDelegate(); 274 RenderViewHostDelegate* GetRenderViewHostDelegate();
274 275
275 // Returns the ProcessMetrics for the render process, if it exists. 276 // Returns the ProcessMetrics for the render process, if it exists.
276 base::ProcessMetrics* MaybeGetProcessMetrics(); 277 base::ProcessMetrics* MaybeGetProcessMetrics();
277 278
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 scoped_ptr<TabContentsWrapper> prerender_contents_; 333 scoped_ptr<TabContentsWrapper> prerender_contents_;
333 334
334 scoped_ptr<PrerenderRenderViewHostObserver> render_view_host_observer_; 335 scoped_ptr<PrerenderRenderViewHostObserver> render_view_host_observer_;
335 336
336 DISALLOW_COPY_AND_ASSIGN(PrerenderContents); 337 DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
337 }; 338 };
338 339
339 } // namespace prerender 340 } // namespace prerender
340 341
341 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_ 342 #endif // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698