Merge 62881 - Moves instant back into flags....

chrome/browser/instant/instant_controller.h

 // Copyright (c) 2010 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 "base/basictypes.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/timer.h"
 #include "chrome/browser/instant/instant_commit_type.h"
 #include "chrome/browser/instant/instant_loader_delegate.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 #include "chrome/common/page_transition_types.h"
 #include "gfx/rect.h"
 #include "googleurl/src/gurl.h"
 
 struct AutocompleteMatch;
 class InstantDelegate;
 class InstantLoaderManager;
 class PrefService;
-class Profile;
 class TabContents;
 class TemplateURL;
 
 // 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:
   explicit InstantController(InstantDelegate* delegate);
   ~InstantController();
 
   // Registers instant related preferences.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Is InstantController enabled?
-  static bool IsEnabled(Profile* profile);
+  static bool IsEnabled();
 
   // Invoked as the user types in the omnibox with the url to navigate to.  If
   // the url is empty and there is a preview TabContents it is destroyed. If url
   // is non-empty and the preview TabContents has not been created it is
   // created.
   void Update(TabContents* tab_contents,
               const AutocompleteMatch& match,
               const string16& user_text,
               string16* suggested_text);
 
@@ skipping 129 matching lines @@
 
   base::OneShotTimer<InstantController> update_timer_;
 
   // URL last pased to ScheduleUpdate.
   GURL scheduled_url_;
 
   DISALLOW_COPY_AND_ASSIGN(InstantController);
 };
 
 #endif  // CHROME_BROWSER_INSTANT_INSTANT_CONTROLLER_H_