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

Unified Diff: chrome/browser/prerender/prerender_contents.h

Issue 10540078: TabContentsWrapper -> TabContents, part 23. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/prerender/prerender_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_contents.h
diff --git a/chrome/browser/prerender/prerender_contents.h b/chrome/browser/prerender/prerender_contents.h
index 0859c3b2498538d0a14e24365d724ffbb01ede4b..cb9f4589873e33b2870b72396aacbf05c8b80f9f 100644
--- a/chrome/browser/prerender/prerender_contents.h
+++ b/chrome/browser/prerender/prerender_contents.h
@@ -23,7 +23,6 @@
class Profile;
class TabContents;
-typedef TabContents TabContentsWrapper;
struct FaviconURL;
namespace base {
@@ -188,12 +187,12 @@ class PrerenderContents : public content::NotificationObserver,
// Adds all alias URLs from another prerender.
void AddAliasURLsFromOtherPrerenderContents(PrerenderContents* other_pc);
- // The preview TabContentsWrapper (may be null).
- TabContentsWrapper* prerender_contents() const {
+ // The preview TabContents (may be null).
+ TabContents* prerender_contents() const {
return prerender_contents_.get();
}
- TabContentsWrapper* ReleasePrerenderContents();
+ TabContents* ReleasePrerenderContents();
// Sets the final status, calls OnDestroy and adds |this| to the
// PrerenderManager's pending deletes list.
@@ -201,7 +200,7 @@ class PrerenderContents : public content::NotificationObserver,
// Applies all the URL history encountered during prerendering to the
// new tab.
- void CommitHistory(TabContentsWrapper* tab);
+ void CommitHistory(TabContents* tab);
base::Value* GetAsValue() const;
@@ -328,8 +327,8 @@ class PrerenderContents : public content::NotificationObserver,
// RenderViewHost for this object.
scoped_ptr<base::ProcessMetrics> process_metrics_;
- // The prerendered TabContentsWrapper; may be null.
- scoped_ptr<TabContentsWrapper> prerender_contents_;
+ // The prerendered TabContents; may be null.
+ scoped_ptr<TabContents> prerender_contents_;
scoped_ptr<PrerenderRenderViewHostObserver> render_view_host_observer_;
« 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