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

Side by Side Diff: chrome/browser/dom_ui/options/advanced_options_handler.cc

Issue 5799001: DOMUI: Temporarily strip trailing colons from section titles until the strings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Win build fix. Created 10 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/dom_ui/options/browser_options_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/dom_ui/options/advanced_options_handler.h" 5 #include "chrome/browser/dom_ui/options/advanced_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "app/l10n_util.h" 9 #include "app/l10n_util.h"
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/utf_string_conversions.h" 13 #include "base/utf_string_conversions.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/dom_ui/options/dom_options_util.h"
15 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h" 16 #include "chrome/browser/dom_ui/options/options_managed_banner_handler.h"
16 #include "chrome/browser/download/download_manager.h" 17 #include "chrome/browser/download/download_manager.h"
17 #include "chrome/browser/download/download_prefs.h" 18 #include "chrome/browser/download/download_prefs.h"
18 #include "chrome/browser/google/google_util.h" 19 #include "chrome/browser/google/google_util.h"
19 #include "chrome/browser/metrics/user_metrics.h" 20 #include "chrome/browser/metrics/user_metrics.h"
20 #include "chrome/browser/prefs/pref_service.h" 21 #include "chrome/browser/prefs/pref_service.h"
21 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" 22 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
22 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 23 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
23 #include "chrome/browser/printing/cloud_print/cloud_print_url.h" 24 #include "chrome/browser/printing/cloud_print/cloud_print_url.h"
24 #include "chrome/browser/profiles/profile.h" 25 #include "chrome/browser/profiles/profile.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 l10n_util::GetStringUTF16( 76 l10n_util::GetStringUTF16(
76 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_WINDOW_TITLE)); 77 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_WINDOW_TITLE));
77 localized_strings->SetString("downloadLocationAskForSaveLocation", 78 localized_strings->SetString("downloadLocationAskForSaveLocation",
78 l10n_util::GetStringUTF16( 79 l10n_util::GetStringUTF16(
79 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION)); 80 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION));
80 localized_strings->SetString("autoOpenFileTypesInfo", 81 localized_strings->SetString("autoOpenFileTypesInfo",
81 l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_INFO)); 82 l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_INFO));
82 localized_strings->SetString("autoOpenFileTypesResetToDefault", 83 localized_strings->SetString("autoOpenFileTypesResetToDefault",
83 l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT)); 84 l10n_util::GetStringUTF16(IDS_OPTIONS_AUTOOPENFILETYPES_RESETTODEFAULT));
84 localized_strings->SetString("gearSettingsGroupName", 85 localized_strings->SetString("gearSettingsGroupName",
85 l10n_util::GetStringUTF16(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME)); 86 dom_options_util::StripColon(
87 l10n_util::GetStringUTF16(IDS_OPTIONS_GEARSSETTINGS_GROUP_NAME)));
86 localized_strings->SetString("gearSettingsConfigureGearsButton", 88 localized_strings->SetString("gearSettingsConfigureGearsButton",
87 l10n_util::GetStringUTF16( 89 l10n_util::GetStringUTF16(
88 IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON)); 90 IDS_OPTIONS_GEARSSETTINGS_CONFIGUREGEARS_BUTTON));
89 localized_strings->SetString("translateEnableTranslate", 91 localized_strings->SetString("translateEnableTranslate",
90 l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE)); 92 l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE));
91 localized_strings->SetString("certificatesManageButton", 93 localized_strings->SetString("certificatesManageButton",
92 l10n_util::GetStringUTF16(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON)); 94 l10n_util::GetStringUTF16(IDS_OPTIONS_CERTIFICATES_MANAGE_BUTTON));
93 localized_strings->SetString("proxiesLabel", 95 localized_strings->SetString("proxiesLabel",
94 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_LABEL)); 96 l10n_util::GetStringUTF16(IDS_OPTIONS_PROXIES_LABEL));
95 localized_strings->SetString("proxiesConfigureButton", 97 localized_strings->SetString("proxiesConfigureButton",
(...skipping 21 matching lines...) Expand all
117 localized_strings->SetString("tabsToLinksPref", 119 localized_strings->SetString("tabsToLinksPref",
118 l10n_util::GetStringUTF16(IDS_OPTIONS_TABS_TO_LINKS_PREF)); 120 l10n_util::GetStringUTF16(IDS_OPTIONS_TABS_TO_LINKS_PREF));
119 localized_strings->SetString("fontSettingsInfo", 121 localized_strings->SetString("fontSettingsInfo",
120 l10n_util::GetStringUTF16(IDS_OPTIONS_FONTSETTINGS_INFO)); 122 l10n_util::GetStringUTF16(IDS_OPTIONS_FONTSETTINGS_INFO));
121 localized_strings->SetString("defaultZoomLevelLabel", 123 localized_strings->SetString("defaultZoomLevelLabel",
122 l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL)); 124 l10n_util::GetStringUTF16(IDS_OPTIONS_DEFAULT_ZOOM_LEVEL_LABEL));
123 localized_strings->SetString("fontSettingsCustomizeFontsButton", 125 localized_strings->SetString("fontSettingsCustomizeFontsButton",
124 l10n_util::GetStringUTF16( 126 l10n_util::GetStringUTF16(
125 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON)); 127 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON));
126 localized_strings->SetString("advancedSectionTitlePrivacy", 128 localized_strings->SetString("advancedSectionTitlePrivacy",
127 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY)); 129 dom_options_util::StripColon(
130 l10n_util::GetStringUTF16(
131 IDS_OPTIONS_ADVANCED_SECTION_TITLE_PRIVACY)));
128 localized_strings->SetString("advancedSectionTitleContent", 132 localized_strings->SetString("advancedSectionTitleContent",
129 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT)); 133 dom_options_util::StripColon(
134 l10n_util::GetStringUTF16(
135 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT)));
130 localized_strings->SetString("advancedSectionTitleSecurity", 136 localized_strings->SetString("advancedSectionTitleSecurity",
131 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY)); 137 dom_options_util::StripColon(
138 l10n_util::GetStringUTF16(
139 IDS_OPTIONS_ADVANCED_SECTION_TITLE_SECURITY)));
132 localized_strings->SetString("advancedSectionTitleNetwork", 140 localized_strings->SetString("advancedSectionTitleNetwork",
133 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK)); 141 dom_options_util::StripColon(
142 l10n_util::GetStringUTF16(
143 IDS_OPTIONS_ADVANCED_SECTION_TITLE_NETWORK)));
134 localized_strings->SetString("advancedSectionTitleTranslate", 144 localized_strings->SetString("advancedSectionTitleTranslate",
135 l10n_util::GetStringUTF16(IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE)); 145 dom_options_util::StripColon(
146 l10n_util::GetStringUTF16(
147 IDS_OPTIONS_ADVANCED_SECTION_TITLE_TRANSLATE)));
136 localized_strings->SetString("translateEnableTranslate", 148 localized_strings->SetString("translateEnableTranslate",
137 l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE)); 149 l10n_util::GetStringUTF16(IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE));
138 #if !defined(OS_CHROMEOS) 150 #if !defined(OS_CHROMEOS)
139 // Add the cloud print proxy management ui section if it's been runtime 151 // Add the cloud print proxy management ui section if it's been runtime
140 // enabled. 152 // enabled.
141 localized_strings->SetString("enable-cloud-print-proxy", 153 localized_strings->SetString("enable-cloud-print-proxy",
142 cloud_print_proxy_ui_enabled_ ? "true" : "false"); 154 cloud_print_proxy_ui_enabled_ ? "true" : "false");
143 localized_strings->SetString("advancedSectionTitleCloudPrint", 155 localized_strings->SetString("advancedSectionTitleCloudPrint",
144 l10n_util::GetStringUTF16( 156 l10n_util::GetStringUTF16(
145 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CLOUD_PRINT)); 157 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CLOUD_PRINT));
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 FundamentalValue useSSL3Value(useSSL3Setting); 575 FundamentalValue useSSL3Value(useSSL3Setting);
564 dom_ui_->CallJavascriptFunction( 576 dom_ui_->CallJavascriptFunction(
565 L"options.AdvancedOptions.SetUseSSL3CheckboxState", 577 L"options.AdvancedOptions.SetUseSSL3CheckboxState",
566 useSSL3Value, disabledValue); 578 useSSL3Value, disabledValue);
567 FundamentalValue useTLS1Value(useTLS1Setting); 579 FundamentalValue useTLS1Value(useTLS1Setting);
568 dom_ui_->CallJavascriptFunction( 580 dom_ui_->CallJavascriptFunction(
569 L"options.AdvancedOptions.SetUseTLS1CheckboxState", 581 L"options.AdvancedOptions.SetUseTLS1CheckboxState",
570 useTLS1Value, disabledValue); 582 useTLS1Value, disabledValue);
571 } 583 }
572 #endif 584 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/dom_ui/options/browser_options_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698