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

Unified Diff: chrome/browser/dom_ui/options/advanced_options_handler.cc

Issue 6490016: DOM UI options handler cleanup: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indent Created 9 years, 10 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/dom_ui/options/advanced_options_handler.cc
diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc
index f8cfcb11e6229d82cbb17972bceb9a90954263ff..f6b11c7f7cc6ee8bf5cdb5ce6de9eb13372eeb0a 100644
--- a/chrome/browser/dom_ui/options/advanced_options_handler.cc
+++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc
@@ -57,6 +57,7 @@ AdvancedOptionsHandler::AdvancedOptionsHandler() {
CommandLine::ForCurrentProcess()->HasSwitch(
switches::kEnableCloudPrintProxy);
#endif
+ cloud_print_proxy_ui_enabled_ = true;
}
AdvancedOptionsHandler::~AdvancedOptionsHandler() {
@@ -66,7 +67,7 @@ void AdvancedOptionsHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
- OptionsStringResource resources[] = {
+ static OptionsStringResource resources[] = {
{ "downloadLocationGroupName",
IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME },
{ "downloadLocationChangeButton",
@@ -187,9 +188,8 @@ void AdvancedOptionsHandler::GetLocalizedValues(
#if !defined(OS_CHROMEOS)
// Add the cloud print proxy management ui section if it's been runtime
// enabled.
- localized_strings->SetString(
- "enable-cloud-print-proxy",
- cloud_print_proxy_ui_enabled_ ? "true" : "false" );
+ localized_strings->SetBoolean("enable-cloud-print-proxy",
+ cloud_print_proxy_ui_enabled_);
#endif
}
@@ -376,7 +376,7 @@ void AdvancedOptionsHandler::HandleMetricsReportingCheckbox(
const ListValue* args) {
#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)
std::string checked_str = WideToUTF8(ExtractStringValue(args));
- bool enabled = (checked_str == "true");
Mike Mammarella 2011/02/11 18:38:48 Personally I like these parens, because they make
Evan Stade 2011/02/11 19:23:33 well, I think clang would complain, but I guess I'
Mike Mammarella 2011/02/11 20:56:19 Yeah, there are just some operators that I don't a
+ bool enabled = checked_str == "true";
UserMetricsRecordAction(
enabled ?
UserMetricsAction("Options_MetricsReportingCheckbox_Enable") :
@@ -402,7 +402,7 @@ void AdvancedOptionsHandler::HandleDefaultFontSize(const ListValue* args) {
void AdvancedOptionsHandler::HandleCheckRevocationCheckbox(
const ListValue* args) {
std::string checked_str = WideToUTF8(ExtractStringValue(args));
- bool enabled = (checked_str == "true");
+ bool enabled = checked_str == "true";
std::string metric =
(enabled ? "Options_CheckCertRevocation_Enable"
: "Options_CheckCertRevocation_Disable");
@@ -412,7 +412,7 @@ void AdvancedOptionsHandler::HandleCheckRevocationCheckbox(
void AdvancedOptionsHandler::HandleUseSSL3Checkbox(const ListValue* args) {
std::string checked_str = WideToUTF8(ExtractStringValue(args));
- bool enabled = (checked_str == "true");
+ bool enabled = checked_str == "true";
std::string metric =
(enabled ? "Options_SSL3_Enable" : "Options_SSL3_Disable");
UserMetricsRecordAction(UserMetricsAction(metric.c_str()));
@@ -421,7 +421,7 @@ void AdvancedOptionsHandler::HandleUseSSL3Checkbox(const ListValue* args) {
void AdvancedOptionsHandler::HandleUseTLS1Checkbox(const ListValue* args) {
std::string checked_str = WideToUTF8(ExtractStringValue(args));
- bool enabled = (checked_str == "true");
+ bool enabled = checked_str == "true";
std::string metric =
(enabled ? "Options_TLS1_Enable" : "Options_TLS1_Disable");
UserMetricsRecordAction(UserMetricsAction(metric.c_str()));

Powered by Google App Engine
This is Rietveld 408576698