summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 17:19:08 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 17:19:08 +0000
commitac662a871353178a664828cef3b247642a382874 (patch)
tree34729fdd7d793d187af6daf7eea0167c156f6a8f
parentc3f4c36132ad5996fa5288b4972411b107b8c0b8 (diff)
downloadchromium_src-ac662a871353178a664828cef3b247642a382874.zip
chromium_src-ac662a871353178a664828cef3b247642a382874.tar.gz
chromium_src-ac662a871353178a664828cef3b247642a382874.tar.bz2
DOMUI Prefs: Prevent prepopulated search engines from having their urls changed
BUG=67093 TEST=Edit a prepopulated search engine in DOMUI prefs; the URL field should be disabled. Review URL: http://codereview.chromium.org/6084002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69840 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/dom_ui/options/search_engine_manager_handler.cc1
-rw-r--r--chrome/browser/resources/options/edit_search_engine_overlay.js4
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/options/search_engine_manager_handler.cc b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc
index 4a06bd59..bbe7234 100644
--- a/chrome/browser/dom_ui/options/search_engine_manager_handler.cc
+++ b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc
@@ -234,6 +234,7 @@ void SearchEngineManagerHandler::EditSearchEngine(const ListValue* args) {
engine_details.SetString("keyword", WideToUTF16Hack(edit_url->keyword()));
engine_details.SetString("url",
WideToUTF16Hack(edit_url->url()->DisplayURL()));
+ engine_details.SetBoolean("urlLocked", edit_url->prepopulate_id() > 0);
dom_ui_->CallJavascriptFunction(L"EditSearchEngineOverlay.setEditDetails",
engine_details);
}
diff --git a/chrome/browser/resources/options/edit_search_engine_overlay.js b/chrome/browser/resources/options/edit_search_engine_overlay.js
index b6f9fcc..a4f72b5 100644
--- a/chrome/browser/resources/options/edit_search_engine_overlay.js
+++ b/chrome/browser/resources/options/edit_search_engine_overlay.js
@@ -69,7 +69,9 @@ cr.define('options', function() {
if (engineDetails) {
$('editSearchEngineName').value = engineDetails['name'];
$('editSearchEngineKeyword').value = engineDetails['keyword'];
- $('editSearchEngineURL').value = engineDetails['url'];
+ var urlField = $('editSearchEngineURL');
+ urlField.value = engineDetails['url'];
+ urlField.disabled = engineDetails['urlLocked'];
this.validateFields_();
} else {
$('editSearchEngineName').value = '';