InstantExtended: Remove overlay control code.

chrome/browser/ui/browser_instant_controller.cc

Index: chrome/browser/ui/browser_instant_controller.cc
diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc
index 8832b7d8377a16315b989642b3426a71e0f65f80..58ca53eea1ccfd3a071fd2b06230b2a03c50d712 100644
--- a/chrome/browser/ui/browser_instant_controller.cc
+++ b/chrome/browser/ui/browser_instant_controller.cc
@@ -37,8 +37,7 @@ using content::UserMetricsAction;
 
 BrowserInstantController::BrowserInstantController(Browser* browser)
     : browser_(browser),
-      instant_(this,
-               chrome::IsInstantExtendedAPIEnabled()),
+      instant_(this, chrome::IsInstantExtendedAPIEnabled()),
       instant_unload_handler_(browser) {
 
   // TODO(sreeram): Perhaps this can be removed, if field trial info is
@@ -144,29 +143,6 @@ Profile* BrowserInstantController::profile() const {
   return browser_->profile();
 }
 
-void BrowserInstantController::CommitInstant(
-    scoped_ptr<content::WebContents> overlay,
-    bool in_new_tab) {
-  const extensions::Extension* extension =
-      profile()->GetExtensionService()->GetInstalledApp(overlay->GetURL());
-  if (extension) {
-    AppLauncherHandler::RecordAppLaunchType(
-        extension_misc::APP_LAUNCH_OMNIBOX_INSTANT,
-        extension->GetType());
-  }
-  if (in_new_tab) {
-    // TabStripModel takes ownership of |overlay|.
-    browser_->tab_strip_model()->AddWebContents(overlay.release(), -1,
-        instant_.last_transition_type(), TabStripModel::ADD_ACTIVE);
-  } else {
-    content::WebContents* contents = overlay.get();
-    ReplaceWebContentsAt(
-        browser_->tab_strip_model()->active_index(),
-        overlay.Pass());
-    browser_->window()->GetLocationBar()->SaveStateToContents(contents);
-  }
-}
-
 void BrowserInstantController::ReplaceWebContentsAt(
     int index,
     scoped_ptr<content::WebContents> new_contents) {
@@ -177,20 +153,6 @@ void BrowserInstantController::ReplaceWebContentsAt(
                                                       index);
 }
 
-void BrowserInstantController::SetInstantSuggestion(
-    const InstantSuggestion& suggestion) {
-  browser_->window()->GetLocationBar()->SetInstantSuggestion(suggestion);
-}
-
-gfx::Rect BrowserInstantController::GetInstantBounds() {
-  return browser_->window()->GetInstantBounds();
-}
-
-void BrowserInstantController::InstantOverlayFocused() {
-  // NOTE: This is only invoked on aura.
-  browser_->window()->WebContentsFocused(instant_.GetOverlayContents());
-}
-
 void BrowserInstantController::FocusOmnibox(bool caret_visibility) {
   OmniboxView* omnibox_view = browser_->window()->GetLocationBar()->
       GetLocationEntry();
@@ -242,9 +204,7 @@ void BrowserInstantController::ToggleVoiceSearch() {
 }
 
 void BrowserInstantController::ResetInstant(const std::string& pref_name) {
-  bool instant_checkbox_checked = chrome::IsInstantCheckboxChecked(profile());
-  bool use_local_overlay_only = !chrome::IsInstantCheckboxEnabled(profile());
-  instant_.SetInstantEnabled(instant_checkbox_checked, use_local_overlay_only);
+  instant_.ReloadStaleNTP();
 }
 
 ////////////////////////////////////////////////////////////////////////////////