Removes different instant behaviors that are no longer used.

chrome/browser/instant/instant_controller.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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_CONTROLLER_H_
 #define CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_
 #pragma once
 
 #include <set>
 #include <string>
 
@@ skipping 25 matching lines @@
 // InstantController maintains a TabContents that is intended to give a preview
 // of a URL. InstantController is owned by Browser.
 //
 // At any time the TabContents maintained by InstantController may be destroyed
 // by way of |DestroyPreviewContents|, which results in |HideInstant| being
 // invoked on the delegate. Similarly the preview may be committed at any time
 // by invoking |CommitCurrentPreview|, which results in |CommitInstant|
 // being invoked on the delegate.
 class InstantController : public InstantLoaderDelegate {
  public:
-  // Variations of instant support.
-  // TODO(sky): nuke these when we decide the default behavior.
-  enum Type {
-    // NOTE: these values are persisted to prefs. Don't change them!
-
-    FIRST_TYPE = 0,
-
-    // Search results are shown for the best guess of what we think the user was
-    // planning on typing.
-    PREDICTIVE_TYPE = 0,
-
-    // Search results are shown for exactly what was typed.
-    VERBATIM_TYPE,
-
-    // Variant of predictive that does not auto-complete after a delay.
-    PREDICTIVE_NO_AUTO_COMPLETE_TYPE,
-
-    LAST_TYPE = PREDICTIVE_NO_AUTO_COMPLETE_TYPE
-  };
-
-
   // Amount of time to wait before starting the instant animation.
   static const int kAutoCommitPauseTimeMS = 1000;
   // Duration of the instant animation in which the colors change.
   static const int kAutoCommitFadeInTimeMS = 300;
 
   InstantController(Profile* profile, InstantDelegate* delegate);
   ~InstantController();
 
   // Registers instant related preferences.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Records instant metrics.
   static void RecordMetrics(Profile* profile);
 
-  // Returns true if either type of instant is enabled.
+  // Returns true if instant is enabled.
   static bool IsEnabled(Profile* profile);
 
-  // Returns true if the specified type of instant is enabled.
-  static bool IsEnabled(Profile* profile, Type type);
-
   // Enables instant.
   static void Enable(Profile* profile);
 
   // Disables instant.
   static void Disable(Profile* profile);
 
   // Accepts the currently showing instant preview, if any, and returns true.
   // Returns false if there is no instant preview showing.
   static bool CommitIfCurrent(InstantController* controller);
 
@@ skipping 152 matching lines @@
   // schedule a task.
   void ScheduleDestroy(InstantLoader* loader);
 
   // Destroys all loaders scheduled for destruction in |ScheduleForDestroy|.
   void DestroyLoaders();
 
   // Returns the TemplateURL to use for the specified AutocompleteMatch, or
   // NULL if there is no TemplateURL for |match|.
   const TemplateURL* GetTemplateURL(const AutocompleteMatch& match);
 
-  // If instant is enabled for the specified profile the type of instant is set
-  // in |type| and true is returned. Otherwise returns false.
-  static bool GetType(Profile* profile, Type* type);
-
-  // Returns a string description for the currently enabled type. This is used
-  // for histograms.
-  static std::string GetTypeString(Profile* profile);
-
   InstantDelegate* delegate_;
 
   // The TabContents last passed to |Update|.
   TabContentsWrapper* tab_contents_;
 
   // See description above getter for details.
   bool is_active_;
 
   // Has notification been sent out that the preview TabContents is ready to be
   // shown?
@@ skipping 17 matching lines @@
   std::set<TemplateURLID> blacklisted_ids_;
 
   base::OneShotTimer<InstantController> update_timer_;
 
   // Used by ScheduleForDestroy; see it for details.
   ScopedRunnableMethodFactory<InstantController> destroy_factory_;
 
   // URL last pased to ScheduleUpdate.
   GURL scheduled_url_;
 
-  Type type_;
-
   // List of InstantLoaders to destroy. See ScheduleForDestroy for details.
   ScopedVector<InstantLoader> loaders_to_destroy_;
 
   // The set of hosts that we don't use instant with. This is shared across all
   // instances and only maintained for the current session.
   static HostBlacklist* host_blacklist_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_