Prerender/Instant interopability.

chrome/browser/instant/instant_loader.h

Index: chrome/browser/instant/instant_loader.h
diff --git a/chrome/browser/instant/instant_loader.h b/chrome/browser/instant/instant_loader.h
index 3aa5235bd92cf81c9304909f998d496deb39abf1..f4f94aabac90af4ead0ca65180a61c5998155a09 100644
--- a/chrome/browser/instant/instant_loader.h
+++ b/chrome/browser/instant/instant_loader.h
@@ -12,6 +12,7 @@
 #include "base/timer.h"
 #include "chrome/browser/instant/instant_commit_type.h"
 #include "chrome/browser/search_engines/template_url_id.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
 #include "chrome/common/instant_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -35,7 +36,8 @@ class TemplateURL;
 //
 // If the TemplateURLID supplied to the constructor is zero, then the url is
 // loaded as is.
-class InstantLoader : public NotificationObserver {
+class InstantLoader : public NotificationObserver,
+                      public TabContentsWrapperDelegate {
  public:
   InstantLoader(InstantLoaderDelegate* delegate, TemplateURLID id);
   virtual ~InstantLoader();
@@ -74,6 +76,10 @@ class InstantLoader : public NotificationObserver {
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
+  // TabContentsWrapperDelegate implementation
+  virtual void SwapTabContents(TabContentsWrapper* old_tc,
+                               TabContentsWrapper* new_tc);

[sky, 2011/05/19 19:53:55]

OVERRIDE

[dominich, 2011/05/19 23:57:28]

Done.

+
   // The preview TabContents; may be null.
   TabContentsWrapper* preview_contents() const {
     return preview_contents_.get();