summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 14:50:01 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-13 14:50:01 +0000
commite59ea965d7a81bd9ee88409a899b2231654e953e (patch)
tree2ee6bf97c35e002c697fcc691a4b5ea71596543a
parent12aa9f234c51f2cb4833df305b7bca0cb7af3346 (diff)
downloadchromium_src-e59ea965d7a81bd9ee88409a899b2231654e953e.zip
chromium_src-e59ea965d7a81bd9ee88409a899b2231654e953e.tar.gz
chromium_src-e59ea965d7a81bd9ee88409a899b2231654e953e.tar.bz2
fixes to r156545
accidentally committed before applying these fixes. BUG=none original review=http://codereview.chromium.org/10914256/ TBR=dbeam Review URL: https://codereview.chromium.org/10905263 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156546 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/content_settings_exceptions_area.js2
-rw-r--r--chrome/browser/resources/options/home_page_overlay.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/resources/options/content_settings_exceptions_area.js b/chrome/browser/resources/options/content_settings_exceptions_area.js
index a3e018a..995d9a3 100644
--- a/chrome/browser/resources/options/content_settings_exceptions_area.js
+++ b/chrome/browser/resources/options/content_settings_exceptions_area.js
@@ -220,7 +220,7 @@ cr.define('options.contentSettings', function() {
else if (setting == 'default')
return '';
- console.error('Unknown setting: . + setting + ');
+ console.error('Unknown setting: [' + setting + ']');
return '';
},
diff --git a/chrome/browser/resources/options/home_page_overlay.js b/chrome/browser/resources/options/home_page_overlay.js
index b4fa037..01a76c5 100644
--- a/chrome/browser/resources/options/home_page_overlay.js
+++ b/chrome/browser/resources/options/home_page_overlay.js
@@ -120,8 +120,9 @@ cr.define('options', function() {
// If the trigger for this update was a value being selected from the
// current list, do nothing.
if (list.targetInput && list.selectedItem &&
- list.selectedItem.url == list.targetInput.value)
+ list.selectedItem.url == list.targetInput.value) {
return;
+ }
list.suggestions = suggestions;
},