InstantExtended: Committed NTP

chrome/browser/instant/instant_tab.cc

Index: chrome/browser/instant/instant_tab.cc
diff --git a/chrome/browser/instant/instant_tab.cc b/chrome/browser/instant/instant_tab.cc
index 33cfe621649223bbfdc5a8f243b12208a394050e..791fddaa45c4afadd78526bb9cde83f1780cebed 100644
--- a/chrome/browser/instant/instant_tab.cc
+++ b/chrome/browser/instant/instant_tab.cc
@@ -4,95 +4,29 @@
 
 #include "chrome/browser/instant/instant_tab.h"
 
-#include "chrome/browser/instant/instant_controller.h"
-
-InstantTab::InstantTab(InstantController* controller,
-                       content::WebContents* contents)
-    : client_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
-      controller_(controller),
-      contents_(contents),
-      supports_instant_(false) {
+InstantTab::InstantTab(InstantPage::Delegate* delegate)
+    : InstantPage(delegate) {
 }
 
 InstantTab::~InstantTab() {
 }
 
-void InstantTab::Init() {
-  client_.SetContents(contents_);
-  client_.DetermineIfPageSupportsInstant();
-}
-
-void InstantTab::Update(const string16& text,
-                        size_t selection_start,
-                        size_t selection_end,
-                        bool verbatim) {
-  client_.Update(text, selection_start, selection_end, verbatim);
-}
-
-void InstantTab::Submit(const string16& text) {
-  client_.Submit(text);
-}
-
-void InstantTab::SendAutocompleteResults(
-    const std::vector<InstantAutocompleteResult>& results) {
-  client_.SendAutocompleteResults(results);
-}
-
-void InstantTab::SetDisplayInstantResults(bool display_instant_results) {
-  client_.SetDisplayInstantResults(display_instant_results);
-}
-
-void InstantTab::UpOrDownKeyPressed(int count) {
-  client_.UpOrDownKeyPressed(count);
-}
-
-void InstantTab::SetMarginSize(int start, int end) {
-  client_.SetMarginSize(start, end);
-}
-
-void InstantTab::SetSuggestions(
-    const std::vector<InstantSuggestion>& suggestions) {
-  InstantSupportDetermined(true);
-  controller_->SetSuggestions(contents_, suggestions);
-}
-
-void InstantTab::InstantSupportDetermined(bool supports_instant) {
-  // If we had already determined that the page supports Instant, nothing to do.
-  if (supports_instant_)
-    return;
-
-  supports_instant_ = supports_instant;
-
-  // If the page doesn't support Instant, stop communicating with it.
-  if (!supports_instant)
-    client_.SetContents(NULL);
-
-  controller_->InstantSupportDetermined(contents_, supports_instant);
-}
-
-void InstantTab::ShowInstantPreview(InstantShownReason /* reason */,
-                                    int /* height */,
-                                    InstantSizeUnits /* units */) {
-  // The page is a committed tab (i.e., always showing), so nothing to do.
-}
-
-void InstantTab::StartCapturingKeyStrokes() {
-  // We don't honor this call from committed tabs.
+void InstantTab::Init(content::WebContents* contents) {
+  SetContents(contents);
+  DetermineIfPageSupportsInstant();
 }
 
-void InstantTab::StopCapturingKeyStrokes() {
-  // We don't honor this call from committed tabs.
+bool InstantTab::ShouldProcessRenderViewGone() const {
+  // For a committed page, a crash should not be handled differently.
+  return false;
 }
 
-void InstantTab::RenderViewGone() {
-  // For a commit page, a crash should not be handled differently.
-}
-
-void InstantTab::AboutToNavigateMainFrame(const GURL& url) {
+bool InstantTab::ShouldProcessAboutToNavigateMainFrame() const {
   // The client is a committed tab, navigations will happen as expected.
+  return false;
 }
 
-void InstantTab::NavigateToURL(const GURL& url,
-                               content::PageTransition transition) {
-  controller_->NavigateToURL(url, transition);
+bool InstantTab::ShouldProcessShowInstantPreview() const {
+  // The page is a committed tab (i.e., always showing), so nothing to do.
+  return false;
 }