InstantExtended: Remove overlay control code.

chrome/browser/ui/browser_instant_controller.cc

 // Copyright 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 "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ skipping 19 matching lines @@
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 
 using content::UserMetricsAction;
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, public:
 
 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
   // available before we need to register the pref.
   chrome::SetInstantExtendedPrefDefault(profile());
 
   profile_pref_registrar_.Init(profile()->GetPrefs());
   profile_pref_registrar_.Add(
       prefs::kSearchInstantEnabled,
       base::Bind(&BrowserInstantController::ResetInstant,
@@ skipping 85 matching lines @@
   if (search_terms.empty())
     return false;
 
   return instant_.SubmitQuery(search_terms);
 }
 
 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) {
   DCHECK_NE(TabStripModel::kNoTab, index);
   scoped_ptr<content::WebContents> old_contents(browser_->tab_strip_model()->
       ReplaceWebContentsAt(index, new_contents.release()));
   instant_unload_handler_.RunUnloadListenersOrDestroy(old_contents.Pass(),
                                                       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();
   omnibox_view->SetFocus();
   omnibox_view->model()->SetCaretVisibility(caret_visibility);
   if (!caret_visibility) {
     // If the user clicked on the fakebox, any text already in the omnibox
     // should get cleared when they start typing. Selecting all the existing
     // text is a convenient way to accomplish this. It also gives a slight
     // visual cue to users who really understand selection state about what will
@@ skipping 31 matching lines @@
 
 void BrowserInstantController::UpdateLocationBar() {
   browser_->window()->UpdateToolbar(GetActiveWebContents(), false);
 }
 
 void BrowserInstantController::ToggleVoiceSearch() {
   instant_.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();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserInstantController, SearchModelObserver implementation:
 
 void BrowserInstantController::ModelChanged(
     const SearchModel::State& old_state,
     const SearchModel::State& new_state) {
   if (old_state.mode != new_state.mode) {
     const SearchMode& new_mode = new_state.mode;
@@ skipping 56 matching lines @@
     if (!instant_service->IsInstantProcess(
             contents->GetRenderProcessHost()->GetID()))
       continue;
 
     // Reload the contents to ensure that it gets assigned to a non-priviledged
     // renderer.
     contents->GetController().Reload(false);
   }
   instant_.OnDefaultSearchProviderChanged();
 }