Centralize logic around Instant modes.

chrome/browser/ui/browser_instant_controller.cc

 // Copyright (c) 2012 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/ui/browser_instant_controller.h"
 
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/instant/instant_unload_handler.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
-#include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
 namespace chrome {
 
@@ skipping 137 matching lines @@
 void BrowserInstantController::TabDeactivated(TabContents* contents) {
   if (instant())
     instant_->Hide();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, private:
 
 void BrowserInstantController::ResetInstant() {
   if (!browser_shutdown::ShuttingDownWithoutClosingBrowsers() &&
-      InstantController::IsEnabled(browser_->profile()) &&
-      browser_->is_type_tabbed() && !browser_->profile()->IsOffTheRecord()) {
-    InstantController::Mode mode = InstantController::INSTANT;
-    if (chrome::search::IsInstantExtendedAPIEnabled(browser_->profile()))
-      mode = InstantController::EXTENDED;
-    instant_.reset(new InstantController(this, mode));
+      browser_->is_type_tabbed()) {

[Peter Kasting, 2012/08/31 01:51:19]

Nit: No {} (2 places).

Another option: Use "XXX ? new YYY : NULL" in both reset() calls.

[sreeram, 2012/09/04 17:42:16]

Done.

+    instant_.reset(InstantController::CreateInstant(browser_->profile(), this));
+  } else {
+    instant_.reset();
+  }
+
+  if (instant()) {
     instant_unload_handler_.reset(new InstantUnloadHandler(browser_));
   } else {
-    instant_.reset();
     instant_unload_handler_.reset();
   }
 }
 
 }  // namespace chrome