Remove unused / unnecessary stuff from Instant.

chrome/browser/instant/instant_controller.cc

Index: chrome/browser/instant/instant_controller.cc
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
index a05c8edef765a65b2820342652d1dac10825ed85..7329aa06958d9691d93bf97ce5c45fdae48e5f8e 100644
--- a/chrome/browser/instant/instant_controller.cc
+++ b/chrome/browser/instant/instant_controller.cc
@@ -15,12 +15,12 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/history_tab_helper.h"
-#include "chrome/browser/instant/instant_controller_delegate.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
@@ -67,9 +67,6 @@ std::string ModeToString(InstantController::Mode mode) {
   switch (mode) {
     case InstantController::EXTENDED: return "_Extended";
     case InstantController::INSTANT:  return "_Instant";
-    case InstantController::SUGGEST:  return "_Suggest";
-    case InstantController::HIDDEN:   return "_Hidden";
-    case InstantController::SILENT:   return "_Silent";
     case InstantController::DISABLED: return "_Disabled";
   }
 
@@ -160,9 +157,9 @@ InstantController::~InstantController() {
 // static
 InstantController* InstantController::CreateInstant(
     Profile* profile,
-    InstantControllerDelegate* delegate) {
+    chrome::BrowserInstantController* browser) {
   const Mode mode = GetModeForProfile(profile);
-  return mode == DISABLED ? NULL : new InstantController(delegate, mode);
+  return mode == DISABLED ? NULL : new InstantController(browser, mode);
 }
 
 // static
@@ -177,12 +174,6 @@ bool InstantController::IsInstantEnabled(Profile* profile) {
 }
 
 // static
-bool InstantController::IsSuggestEnabled(Profile* profile) {
-  const Mode mode = GetModeForProfile(profile);
-  return mode == EXTENDED || mode == INSTANT || mode == SUGGEST;
-}
-
-// static
 void InstantController::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kInstantConfirmDialogShown, false,
                              PrefService::SYNCABLE_PREF);
@@ -194,7 +185,7 @@ bool InstantController::Update(const AutocompleteMatch& match,
                                const string16& user_text,
                                const string16& full_text,
                                bool verbatim) {
-  const TabContents* active_tab = delegate_->GetActiveTabContents();
+  const TabContents* active_tab = browser_->GetActiveTabContents();
 
   // We could get here with no active tab if the Browser is closing.
   if (!active_tab) {
@@ -238,7 +229,7 @@ bool InstantController::Update(const AutocompleteMatch& match,
   // Don't send an update to the loader if the query text hasn't changed.
   if (query_text == last_query_text && verbatim == last_verbatim_) {
     // Reuse the last suggestion, as it's still valid.
-    delegate_->SetInstantSuggestion(last_suggestion_);
+    browser_->SetInstantSuggestion(last_suggestion_);
 
     // We need to call Show() here because of this:
     // 1. User has typed a query (say Q). Instant overlay is showing results.
@@ -246,8 +237,7 @@ bool InstantController::Update(const AutocompleteMatch& match,
     //    these cause the overlay to Hide().
     // 3. User arrows-up to Q or types Q again. The last text we processed is
     //    still Q, so we don't Update() the loader, but we do need to Show().
-    if (loader_processed_last_update_ &&
-        (mode_ == INSTANT || mode_ == EXTENDED))
+    if (loader_processed_last_update_)
       Show(100, INSTANT_SIZE_PERCENT);
     return true;
   }
@@ -256,17 +246,15 @@ bool InstantController::Update(const AutocompleteMatch& match,
   loader_processed_last_update_ = false;
   last_suggestion_ = InstantSuggestion();
 
-  if (mode_ != SILENT) {
-    loader_->Update(query_text, verbatim);
+  loader_->Update(query_text, verbatim);
 
-    content::NotificationService::current()->Notify(
-        chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
-        content::Source<InstantController>(this),
-        content::NotificationService::NoDetails());
-  }
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
+      content::Source<InstantController>(this),
+      content::NotificationService::NoDetails());
 
   // We don't have suggestions yet, but need to reset any existing "gray text".
-  delegate_->SetInstantSuggestion(InstantSuggestion());
+  browser_->SetInstantSuggestion(InstantSuggestion());
 
   // Though we may have handled a URL match above, we return false here, so that
   // omnibox prerendering can kick in. TODO(sreeram): Remove this (and always
@@ -277,7 +265,7 @@ bool InstantController::Update(const AutocompleteMatch& match,
 // TODO(tonyg): This method only fires when the omnibox bounds change. It also
 // needs to fire when the preview bounds change (e.g.: open/close info bar).
 void InstantController::SetOmniboxBounds(const gfx::Rect& bounds) {
-  if (omnibox_bounds_ == bounds || (mode_ != INSTANT && mode_ != EXTENDED))
+  if (omnibox_bounds_ == bounds)
     return;
 
   omnibox_bounds_ = bounds;
@@ -411,14 +399,14 @@ void InstantController::CommitCurrentPreview(InstantCommitType type) {
   preview->web_contents()->GetController().PruneAllButActive();
 
   if (type != INSTANT_COMMIT_PRESSED_ALT_ENTER) {
-    const TabContents* active_tab = delegate_->GetActiveTabContents();
+    const TabContents* active_tab = browser_->GetActiveTabContents();
     AddSessionStorageHistogram(mode_, active_tab, preview);
     preview->web_contents()->GetController().CopyStateFromAndPrune(
         &active_tab->web_contents()->GetController());
   }
 
-  // Delegate takes ownership of the preview.
-  delegate_->CommitInstant(preview, type == INSTANT_COMMIT_PRESSED_ALT_ENTER);
+  // Browser takes ownership of the preview.
+  browser_->CommitInstant(preview, type == INSTANT_COMMIT_PRESSED_ALT_ENTER);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_INSTANT_COMMITTED,
@@ -535,7 +523,7 @@ bool InstantController::commit_on_pointer_release() const {
 void InstantController::SetSuggestions(
     InstantLoader* loader,
     const std::vector<InstantSuggestion>& suggestions) {
-  if (loader_ != loader || IsOutOfDate() || mode_ == SILENT || mode_ == HIDDEN)
+  if (loader_ != loader || IsOutOfDate())
     return;
 
   loader_processed_last_update_ = true;
@@ -554,7 +542,7 @@ void InstantController::SetSuggestions(
     last_verbatim_ = true;
     last_suggestion_ = InstantSuggestion();
     last_match_was_search_ = suggestion.type == INSTANT_SUGGESTION_SEARCH;
-    delegate_->SetInstantSuggestion(suggestion);
+    browser_->SetInstantSuggestion(suggestion);
   } else {
     // Suggestion text should be a full URL for URL suggestions, or the
     // completion of a query for query suggestions.
@@ -580,11 +568,10 @@ void InstantController::SetSuggestions(
     // INSTANT_COMPLETE_NEVER irrespective of verbatim because in this case
     // the suggested text does not get committed if the user presses enter.
     if (suggestion.behavior == INSTANT_COMPLETE_NEVER || !last_verbatim_)
-      delegate_->SetInstantSuggestion(suggestion);
+      browser_->SetInstantSuggestion(suggestion);
   }
 
-  if (mode_ != SUGGEST)
-    Show(100, INSTANT_SIZE_PERCENT);
+  Show(100, INSTANT_SIZE_PERCENT);
 }
 
 void InstantController::CommitInstantLoader(InstantLoader* loader) {
@@ -644,13 +631,13 @@ void InstantController::InstantLoaderContentsFocused(InstantLoader* loader) {
   // On aura the omnibox only receives a focus lost if we initiate the focus
   // change. This does that.
   if (model_.is_ready() && !IsOutOfDate())
-    delegate_->InstantPreviewFocused();
+    browser_->InstantPreviewFocused();
 #endif
 }
 
-InstantController::InstantController(InstantControllerDelegate* delegate,
+InstantController::InstantController(chrome::BrowserInstantController* browser,
                                      Mode mode)
-    : delegate_(delegate),
+    : browser_(browser),
       model_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       mode_(mode),
       last_active_tab_(NULL),
@@ -688,7 +675,7 @@ void InstantController::ResetLoader(const std::string& instant_url,
 }
 
 bool InstantController::CreateDefaultLoader() {
-  const TabContents* active_tab = delegate_->GetActiveTabContents();
+  const TabContents* active_tab = browser_->GetActiveTabContents();
 
   // We could get here with no active tab if the Browser is closing.
   if (!active_tab)
@@ -750,7 +737,7 @@ void InstantController::SendBoundsToPage() {
     return;
 
   last_omnibox_bounds_ = omnibox_bounds_;
-  gfx::Rect preview_bounds = delegate_->GetInstantBounds();
+  gfx::Rect preview_bounds = browser_->GetInstantBounds();
   gfx::Rect intersection = omnibox_bounds_;
   intersection.Intersect(preview_bounds);
 
@@ -827,5 +814,5 @@ bool InstantController::GetInstantURL(const TemplateURL* template_url,
 
 bool InstantController::IsOutOfDate() const {
   return !last_active_tab_ ||
-         last_active_tab_ != delegate_->GetActiveTabContents();
+         last_active_tab_ != browser_->GetActiveTabContents();
 }