Prerender/Instant interopability.

chrome/browser/instant/instant_loader.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #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"
 #include "content/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
 
 class InstantLoaderDelegate;
 class InstantLoaderManagerTest;
 class TabContents;
 class TabContentsWrapper;
 class TemplateURL;
 
 // InstantLoader does the loading of a particular URL for InstantController.
 // InstantLoader notifies its delegate, which is typically InstantController, of
 // all interesting events.
 //
 // InstantLoader is created with a TemplateURLID. If non-zero InstantLoader
 // first determines if the site actually supports instant. If it doesn't, the
 // delegate is notified by way of |InstantLoaderDoesntSupportInstant|.
 //
 // 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 {

[sky, 2011/05/20 15:57:36]

Make TabContentsWrapperDelegate implement this. It's the place meant to
encapsulate all the delegate logic.

[dominich, 2011/05/20 16:39:53]

Done.

  public:
   InstantLoader(InstantLoaderDelegate* delegate, TemplateURLID id);
   virtual ~InstantLoader();
 
   // Invoked to load a URL. |tab_contents| is the TabContents the preview is
   // going to be shown on top of and potentially replace. Returns true if the
   // arguments differ from the last call to |Update|.
   bool Update(TabContentsWrapper* tab_contents,
               const TemplateURL* template_url,
               const GURL& url,
@@ skipping 18 matching lines @@
 
   // Calls through to method of same name on delegate.
   bool ShouldCommitInstantOnMouseUp();
   void CommitInstantLoader();
 
   // NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
+  // TabContentsWrapperDelegate implementation
+  virtual void SwapTabContents(TabContentsWrapper* old_tc,
+                               TabContentsWrapper* new_tc) OVERRIDE;
+
   // The preview TabContents; may be null.
   TabContentsWrapper* preview_contents() const {
     return preview_contents_.get();
   }
 
   // Returns true if the preview TabContents is ready to be shown.
   bool ready() const { return ready_; }
 
   // Returns true if the current load returned a 200.
   bool http_status_ok() const { return http_status_ok_; }
@@ skipping 56 matching lines @@
   void PageDoesntSupportInstant(bool needs_reload);
 
   // Invokes |SetBoundsToPage(false)|. This is called from the timer.
   void ProcessBoundsChange();
 
   // Notifes the page of the omnibox bounds. If |force_if_loading| is true the
   // bounds are sent down even if we're waiting on the load, otherwise if we're
   // waiting on the load and |force_if_loading| is false this does nothing.
   void SendBoundsToPage(bool force_if_loading);
 
+  // Called to set up the preview_contents_ when it is created or replaced.

[sky, 2011/05/20 15:57:36]

preview_contents_ -> |tab_contents|
But looking at the implementation, the implementation should either use
preview_contents_ every where and not take tab_contents as a parameter, or using
the parameter and not tab_contents.

[dominich, 2011/05/20 16:39:53]

The implementation should be using preview_contents_ everywhere. tab_contents is
either the TabContentsWrapper passed in from CreatePreviewContents, or the old
preview_contents_ being replaced.

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

My mistake. I was assuming tab_contents is the new tab contents, when it isn't.
Please update the description to clarify that.

+  void SetupPreviewContents(TabContentsWrapper* tab_contents);
+
   // Creates and sets the preview TabContentsWrapper.
   void CreatePreviewContents(TabContentsWrapper* tab_contents);
 
   InstantLoaderDelegate* delegate_;
 
   // If we're showing instant results this is the ID of the TemplateURL driving
   // the results. A value of 0 means there is no TemplateURL.
   const TemplateURLID template_url_id_;
 
   // The url we're displaying.
@@ skipping 41 matching lines @@
   // Last value of verbatim passed to |Update|.
   bool verbatim_;
 
   // True if the page needs to be reloaded.
   bool needs_reload_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantLoader);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_LOADER_H_