InstantExtended: Committed NTP

chrome/browser/instant/instant_tab.h

Index: chrome/browser/instant/instant_tab.h
diff --git a/chrome/browser/instant/instant_tab.h b/chrome/browser/instant/instant_tab.h
index 2e0321abe3bb6926efaff9b8bb7b9ee9214bf960..456c84bab94ba5ff433bbad4d6c0ea6f68373d43 100644
--- a/chrome/browser/instant/instant_tab.h
+++ b/chrome/browser/instant/instant_tab.h
@@ -10,7 +10,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "chrome/browser/instant/instant_client.h"
+#include "chrome/browser/instant/instant_page.h"
 
 struct InstantAutocompleteResult;
 class InstantController;
@@ -19,52 +19,35 @@ namespace content {
 class WebContents;
 }
 
-// InstantTab is used to communicate with a committed search results page, i.e.,
-// an actual tab on the tab strip (compare: InstantLoader, which has a preview
-// page that appears and disappears as the user types in the omnibox).
-class InstantTab : public InstantClient::Delegate {
+// InstantTab represents a committed page (i.e. an actual tab on the tab strip)
+// that supports the Instant API.
+class InstantTab : public InstantPage {
  public:
   // Doesn't take ownership of either |controller| or |contents|.
   InstantTab(InstantController* controller, content::WebContents* contents);
   virtual ~InstantTab();
 
-  content::WebContents* contents() const { return contents_; }
-
   // Start observing |contents_| for messages. Sends a message to determine if
   // the page supports the Instant API.
   void Init();
 
-  // Calls through to methods of the same name on InstantClient.
-  void Update(const string16& text,
-              size_t selection_start,
-              size_t selection_end,
-              bool verbatim);
-  void Submit(const string16& text);
-  void SendAutocompleteResults(
-      const std::vector<InstantAutocompleteResult>& results);
-  void SetDisplayInstantResults(bool display_instant_results);
-  void UpOrDownKeyPressed(int count);
-  void SetMarginSize(int start, int end);
+  // Overriden from InstantPage.
+  virtual content::WebContents* contents() const OVERRIDE {
+    return contents_;
+  }
 
  private:
-  // Overridden from InstantClient::Delegate:
-  virtual void SetSuggestions(
-      const std::vector<InstantSuggestion>& suggestions) OVERRIDE;
-  virtual void InstantSupportDetermined(bool supports_instant) OVERRIDE;
-  virtual void ShowInstantPreview(InstantShownReason reason,
-                                  int height,
-                                  InstantSizeUnits units) OVERRIDE;
-  virtual void StartCapturingKeyStrokes() OVERRIDE;
-  virtual void StopCapturingKeyStrokes() OVERRIDE;
-  virtual void RenderViewGone() OVERRIDE;
-  virtual void AboutToNavigateMainFrame(const GURL& url) OVERRIDE;
-  virtual void NavigateToURL(const GURL& url,
-                             content::PageTransition transition) OVERRIDE;
+  // Overridden from InstantAPIWrapper::Controller.
+  virtual void OnUpdate() OVERRIDE;
+  virtual bool OnRenderViewGone() const OVERRIDE;
+  virtual bool OnAboutToNavigateMainFrame() const OVERRIDE;
+  virtual bool OnSetSuggestions() const OVERRIDE;
+  virtual bool OnShowInstantPreview() const OVERRIDE;
+  virtual bool OnStartCapturingKeyStrokes() const OVERRIDE;
+  virtual bool OnStopCapturingKeyStrokes() const OVERRIDE;
+  virtual bool OnNavigateToURL() const OVERRIDE;
 
-  InstantClient client_;
-  InstantController* const controller_;
   content::WebContents* const contents_;
-  bool supports_instant_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantTab);
 };