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

chrome/browser/browser.cc

 // 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.
 
 #include "chrome/browser/browser.h"
 
 #if defined(OS_WIN)
 #include <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 222 matching lines @@
   PrefService* local_state = g_browser_process->local_state();
   if (local_state)
     printing_enabled_.Init(prefs::kPrintingEnabled, local_state, this);
 
   InitCommandState();
   BrowserList::AddBrowser(this);
 
   encoding_auto_detect_.Init(prefs::kWebKitUsesUniversalDetector,
                              profile_->GetPrefs(), NULL);
   use_vertical_tabs_.Init(prefs::kUseVerticalTabs, profile_->GetPrefs(), this);
-  instant_enabled_.Init(prefs::kInstantEnabled, profile_->GetPrefs(), this);
   if (!TabMenuModel::AreVerticalTabsEnabled()) {
     // If vertical tabs aren't enabled, explicitly turn them off. Otherwise we
     // might show vertical tabs but not show an option to turn them off.
     use_vertical_tabs_.SetValue(false);
   }
   UpdateTabStripModelInsertionPolicy();
 
   tab_restore_service_ = profile->GetTabRestoreService();
   if (tab_restore_service_) {
     tab_restore_service_->AddObserver(this);
@@ skipping 3047 matching lines @@
       window()->ShowProfileErrorDialog(*message_id);
       break;
     }
 
     case NotificationType::PREF_CHANGED: {
       const std::string& pref_name = *Details<std::string>(details).ptr();
       if (pref_name == prefs::kUseVerticalTabs) {
         UseVerticalTabsChanged();
       } else if (pref_name == prefs::kPrintingEnabled) {
         UpdatePrintingState(0);
-      } else if (pref_name == prefs::kInstantEnabled) {
-        if (!InstantController::IsEnabled(profile())) {
-          if (instant()) {
-            instant()->DestroyPreviewContents();
-            instant_.reset(NULL);
-          }
-        } else {
-          CreateInstantIfNecessary();
-        }
       } else {
         NOTREACHED();
       }
       break;
     }
 
     default:
       NOTREACHED() << "Got a notification we didn't register for.";
   }
 }
@@ skipping 909 matching lines @@
     return true;
   }
   // The omnibox currently doesn't use other dispositions, so we don't attempt
   // to handle them. If you hit this NOTREACHED file a bug and I'll (sky) add
   // support for the new disposition.
   NOTREACHED();
   return false;
 }
 
 void Browser::CreateInstantIfNecessary() {
-  if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
+  if (type() == TYPE_NORMAL && InstantController::IsEnabled() &&
       !profile()->IsOffTheRecord()) {
     instant_.reset(new InstantController(this));
   }
 }