Merge 84723 - Options: Disconnect the Instant option from the search engine select.

BUG=81356
TEST=none

R=sky@chromium.org

Review URL: http://codereview.chromium.org/6980010

TBR=jhawkins@chromium.org
Review URL: http://codereview.chromium.org/7002010

git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84868 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 0 insertions, 5 deletions

diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 7d0f3a7..2a154a8 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -198,15 +198,12 @@ cr.define('options', function() {
       for (var i = 0; i < engineCount; i++) {
         var engine = engines[i];
         var option = new Option(engine['name'], engine['index']);
-        option.hasInstant = engine['hasInstant'];
         if (defaultValue == option.value)
           defaultIndex = i;
         engineSelect.appendChild(option);
       }
       if (defaultIndex >= 0)
         engineSelect.selectedIndex = defaultIndex;
-
-      this.setDefaultSearchEngine_();
     },
 
     /**
@@ -420,7 +417,6 @@ cr.define('options', function() {
       var selectedIndex = engineSelect.selectedIndex;
       if (selectedIndex >= 0) {
         var selection = engineSelect.options[selectedIndex];
-        $('instantEnableCheckbox').disabled = !selection.hasInstant;
         chrome.send('setDefaultSearchEngine', [String(selection.value)]);
       }
     },
diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc
index cc72e51..2fc8a28 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -267,7 +267,6 @@ void BrowserOptionsHandler::OnTemplateURLModelChanged() {
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("name", model_urls[i]->short_name());
     entry->SetInteger("index", i);
-    entry->SetBoolean("hasInstant", model_urls[i]->instant_url() != NULL);
     search_engines.Append(entry);
     if (model_urls[i] == default_url)
       default_index = i;