Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: chrome/browser/resources/options/hotword_confirm_dialog.js

Issue 463823002: Settings page: Do not grey out the "Ok Google" checkbox on errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/options/hotword_confirm_dialog.js
diff --git a/chrome/browser/resources/options/hotword_confirm_dialog.js b/chrome/browser/resources/options/hotword_confirm_dialog.js
index 840539409dae6372a211e9c1ed55c3f11cffa63b..e81a62fc59a9541b56249409155bdfd9bc09582d 100644
--- a/chrome/browser/resources/options/hotword_confirm_dialog.js
+++ b/chrome/browser/resources/options/hotword_confirm_dialog.js
@@ -49,12 +49,12 @@ cr.define('options', function() {
return;
if (event.value.value && !this.confirmed_) {
- if (!this.indicator.errorText) {
- PageManager.showPageByName(this.name, false);
- } else {
+ // If there is an error, show the indicator icon with more information.
+ if (this.indicator.errorText)
this.indicator.updateBasedOnError();
- this.handleCancel();
- }
+
+ // Show confirmation dialog (regardless of whether there is an error).
+ PageManager.showPageByName(this.name, false);
} else {
Preferences.getInstance().commitPref(this.pref, this.metric);
}

Powered by Google App Engine
This is Rietveld 408576698