| Index: chrome/browser/instant/instant_controller.cc
|
| diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc
|
| index 24c70f895cb1efb1745b7b6001198953997a8e66..40f9d71511e0712ecc7332adeb227ed78f7adaef 100644
|
| --- a/chrome/browser/instant/instant_controller.cc
|
| +++ b/chrome/browser/instant/instant_controller.cc
|
| @@ -28,7 +28,8 @@ void InstantController::RegisterUserPrefs(PrefService* prefs) {
|
| }
|
|
|
| // static
|
| -bool InstantController::IsEnabled(Profile* profile) {
|
| +bool InstantController::IsEnabled() {
|
| + // TODO: convert to kInstantEnabled once pref lands.
|
| static bool enabled = false;
|
| static bool checked = false;
|
| if (!checked) {
|
| @@ -36,8 +37,7 @@ bool InstantController::IsEnabled(Profile* profile) {
|
| enabled = CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kEnableMatchPreview);
|
| }
|
| - PrefService* prefs = profile->GetPrefs();
|
| - return (enabled || (prefs && prefs->GetBoolean(prefs::kInstantEnabled)));
|
| + return enabled;
|
| }
|
|
|
| InstantController::InstantController(InstantDelegate* delegate)
|
|
|