From 3c9e187bd8ec34ebf2a91a37c868584c465647e8 Mon Sep 17 00:00:00 2001 From: "ben@chromium.org" Date: Thu, 18 Nov 2010 16:17:49 +0000 Subject: Make pink's TabContentsWrapper change compile on Windows. Code by pinkerton@, with modifications by evanm and myself to get it to build on windows/linux/chromeos. BUG=none TEST=none Review URL: http://codereview.chromium.org/4694008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66626 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/instant/instant_loader.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'chrome/browser/instant/instant_loader.h') diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/instant/instant_loader.h index b2dfb66..223fffb 100644 --- a/chrome/browser/instant/instant_loader.h +++ b/chrome/browser/instant/instant_loader.h @@ -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 @@ class InstantLoader : public NotificationObserver { // 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 @@ class InstantLoader : public NotificationObserver { // 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 @@ class InstantLoader : public NotificationObserver { 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 @@ class InstantLoader : public NotificationObserver { scoped_ptr preview_tab_contents_delegate_; // The preview TabContents; may be null. - scoped_ptr preview_contents_; + scoped_ptr preview_contents_; // Is the preview_contents ready to be shown? bool ready_; -- cgit v1.1