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

Unified Diff: chrome/browser/ui/webui/voice_search_ui.cc

Issue 1203923002: voice_search_ui: Simplify code for displaying Booleans. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@hotword-clarify-labels
Patch Set: Created 5 years, 6 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/voice_search_ui.cc
diff --git a/chrome/browser/ui/webui/voice_search_ui.cc b/chrome/browser/ui/webui/voice_search_ui.cc
index a6851b317d269d4a269e542456033d116d362f4c..a499ab21750cc6d2fe9d8a8c7d3ea37d94254d1d 100644
--- a/chrome/browser/ui/webui/voice_search_ui.cc
+++ b/chrome/browser/ui/webui/voice_search_ui.cc
@@ -86,6 +86,12 @@ void AddPair(base::ListValue* list,
AddPair16(list, UTF8ToUTF16(key), UTF8ToUTF16(value));
}
+void AddPairBool(base::ListValue* list,
+ const base::StringPiece& key,
+ bool value) {
+ AddPair(list, key, value ? "Yes" : "No");
+}
+
// Generate an empty data-pair which acts as a line break.
void AddLineBreak(base::ListValue* list) {
AddPair(list, "", "");
@@ -271,14 +277,11 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
HotwordService* hotword_service =
HotwordServiceFactory::GetForProfile(profile_);
- AddPair(list, "Microphone Present",
- hotword_service && hotword_service->microphone_available() ? "Yes"
- : "No");
+ AddPairBool(list, "Microphone Present",
+ hotword_service && hotword_service->microphone_available());
- std::string audio_capture = "No";
- if (profile_->GetPrefs()->GetBoolean(prefs::kAudioCaptureAllowed))
- audio_capture = "Yes";
- AddPair(list, "Audio Capture Allowed", audio_capture);
+ AddPairBool(list, "Audio Capture Allowed",
+ profile_->GetPrefs()->GetBoolean(prefs::kAudioCaptureAllowed));
AddLineBreak(list);
}
@@ -305,25 +308,18 @@ class VoiceSearchDomHandler : public WebUIMessageHandler {
void AddHotwordInfo(base::ListValue* list) {
HotwordService* hotword_service =
HotwordServiceFactory::GetForProfile(profile_);
- std::string hotword_allowed = "No";
- if (hotword_service && hotword_service->IsHotwordAllowed())
- hotword_allowed = "Yes";
- AddPair(list, "Hotword Module Installable", hotword_allowed);
-
- std::string search_enabled = "No";
- if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled))
- search_enabled = "Yes";
- AddPair(list, "Hotword Search Enabled", search_enabled);
-
- std::string always_on_search_enabled = "No";
- if (profile_->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled))
- always_on_search_enabled = "Yes";
- AddPair(list, "Always-on Hotword Search Enabled", always_on_search_enabled);
-
- std::string audio_logging_enabled = "No";
- if (hotword_service && hotword_service->IsOptedIntoAudioLogging())
- audio_logging_enabled = "Yes";
- AddPair(list, "Hotword Audio Logging Enabled", audio_logging_enabled);
+ AddPairBool(list, "Hotword Module Installable",
+ hotword_service && hotword_service->IsHotwordAllowed());
+
+ AddPairBool(list, "Hotword Search Enabled",
+ profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled));
+
+ AddPairBool(
+ list, "Always-on Hotword Search Enabled",
+ profile_->GetPrefs()->GetBoolean(prefs::kHotwordAlwaysOnSearchEnabled));
+
+ AddPairBool(list, "Hotword Audio Logging Enabled",
+ hotword_service && hotword_service->IsOptedIntoAudioLogging());
AddLineBreak(list);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698