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..fec9069f5d005bc20177d244084d784522f46651 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"

[sky, 2011/05/20 18:54:19]

You don't need this include anymore.

[dominich, 2011/05/20 23:22:34]

great spot. thank you.

 #include "chrome/common/instant_types.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -150,6 +151,14 @@ class InstantLoader : public NotificationObserver {
   // waiting on the load and |force_if_loading| is false this does nothing.
   void SendBoundsToPage(bool force_if_loading);
 
+  // Called when the TabContentsDelegate wants to swap a new TabContentsWrapper
+  // into our preview_contents_.

[sky, 2011/05/20 18:54:19]

Use || around fields, eg |preview_contents_|. And on 159.

+  void ReplacePreviewContents(TabContentsWrapper* old_tc,
+                              TabContentsWrapper* new_tc);
+
+  // Called to set up the preview_contents_ when it is created or replaced.
+  void SetupPreviewContents(TabContentsWrapper* tab_contents);
+
   // Creates and sets the preview TabContentsWrapper.
   void CreatePreviewContents(TabContentsWrapper* tab_contents);