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

Unified Diff: chrome/browser/instant/instant_loader.h

Issue 4694008: Make pink's TabContentsWrapper change compile on Windows.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month 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
Index: chrome/browser/instant/instant_loader.h
===================================================================
--- chrome/browser/instant/instant_loader.h (revision 66453)
+++ chrome/browser/instant/instant_loader.h (working copy)
@@ -21,6 +21,7 @@
class InstantLoaderDelegate;
class InstantLoaderManagerTest;
class TabContents;
+class TabContentsWrapper;
class TemplateURL;
// InstantLoader does the loading of a particular URL for InstantController.
@@ -40,7 +41,7 @@
// Invoked to load a URL. |tab_contents| is the TabContents the preview is
// going to be shown on top of and potentially replace.
- void Update(TabContents* tab_contents,
+ void Update(TabContentsWrapper* tab_contents,
const TemplateURL* template_url,
const GURL& url,
PageTransition::Type transition_type,
@@ -59,7 +60,7 @@
// Releases the preview TabContents passing ownership to the caller. This is
// intended to be called when the preview TabContents is committed. This does
// not notify the delegate.
- TabContents* ReleasePreviewContents(InstantCommitType type);
+ TabContentsWrapper* ReleasePreviewContents(InstantCommitType type);
// Calls through to method of same name on delegate.
bool ShouldCommitInstantOnMouseUp();
@@ -74,7 +75,9 @@
const NotificationDetails& details);
// The preview TabContents; may be null.
- TabContents* preview_contents() const { return preview_contents_.get(); }
+ TabContentsWrapper* preview_contents() const {
+ return preview_contents_.get();
+ }
// Returns true if the preview TabContents is ready to be shown.
bool ready() const { return ready_; }
@@ -145,7 +148,7 @@
scoped_ptr<TabContentsDelegateImpl> preview_tab_contents_delegate_;
// The preview TabContents; may be null.
- scoped_ptr<TabContents> preview_contents_;
+ scoped_ptr<TabContentsWrapper> preview_contents_;
// Is the preview_contents ready to be shown?
bool ready_;

Powered by Google App Engine
This is Rietveld 408576698