OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/webui/options/browser_options_handler.h" | 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "apps/app_window.h" | 10 #include "apps/app_window.h" |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
192 // away so they don't try and call back to us. | 192 // away so they don't try and call back to us. |
193 if (select_folder_dialog_.get()) | 193 if (select_folder_dialog_.get()) |
194 select_folder_dialog_->ListenerDestroyed(); | 194 select_folder_dialog_->ListenerDestroyed(); |
195 } | 195 } |
196 | 196 |
197 void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { | 197 void BrowserOptionsHandler::GetLocalizedValues(base::DictionaryValue* values) { |
198 DCHECK(values); | 198 DCHECK(values); |
199 | 199 |
200 const bool using_new_profiles_ui = switches::IsNewAvatarMenu(); | 200 const bool using_new_profiles_ui = switches::IsNewAvatarMenu(); |
201 | 201 |
| 202 #if defined(OS_CHROMEOS) |
| 203 const int device_type_resource_id = chromeos::GetChromeDeviceTypeResourceId(); |
| 204 #else |
| 205 // TODO(isherman): Set an appropriate device name for non-ChromeOS devices. |
| 206 const int device_type_resource_id = IDS_EASY_UNLOCK_GENERIC_DEVICE_TYPE; |
| 207 #endif // defined(OS_CHROMEOS) |
| 208 |
202 static OptionsStringResource resources[] = { | 209 static OptionsStringResource resources[] = { |
203 { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT }, | 210 { "advancedSectionTitleCloudPrint", IDS_GOOGLE_CLOUD_PRINT }, |
204 { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY }, | 211 { "currentUserOnly", IDS_OPTIONS_CURRENT_USER_ONLY }, |
205 { "advancedSectionTitleCertificates", | 212 { "advancedSectionTitleCertificates", |
206 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES }, | 213 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CERTIFICATES }, |
207 { "advancedSectionTitleContent", | 214 { "advancedSectionTitleContent", |
208 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT }, | 215 IDS_OPTIONS_ADVANCED_SECTION_TITLE_CONTENT }, |
209 { "advancedSectionTitleLanguages", | 216 { "advancedSectionTitleLanguages", |
210 IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES }, | 217 IDS_OPTIONS_ADVANCED_SECTION_TITLE_LANGUAGES }, |
211 { "advancedSectionTitleNetwork", | 218 { "advancedSectionTitleNetwork", |
(...skipping 27 matching lines...) Expand all Loading... |
239 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE }, | 246 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_DISABLE }, |
240 { "downloadLocationAskForSaveLocation", | 247 { "downloadLocationAskForSaveLocation", |
241 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, | 248 IDS_OPTIONS_DOWNLOADLOCATION_ASKFORSAVELOCATION }, |
242 { "downloadLocationBrowseTitle", | 249 { "downloadLocationBrowseTitle", |
243 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, | 250 IDS_OPTIONS_DOWNLOADLOCATION_BROWSE_TITLE }, |
244 { "downloadLocationChangeButton", | 251 { "downloadLocationChangeButton", |
245 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, | 252 IDS_OPTIONS_DOWNLOADLOCATION_CHANGE_BUTTON }, |
246 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, | 253 { "downloadLocationGroupName", IDS_OPTIONS_DOWNLOADLOCATION_GROUP_NAME }, |
247 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, | 254 { "enableLogging", IDS_OPTIONS_ENABLE_LOGGING }, |
248 { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART }, | 255 { "metricsReportingResetRestart", IDS_OPTIONS_ENABLE_LOGGING_RESTART }, |
249 { "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION }, | 256 { "easyUnlockDescription", IDS_OPTIONS_EASY_UNLOCK_DESCRIPTION, |
| 257 device_type_resource_id }, |
250 { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE }, | 258 { "easyUnlockSectionTitle", IDS_OPTIONS_EASY_UNLOCK_SECTION_TITLE }, |
251 { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON }, | 259 { "easyUnlockSetupButton", IDS_OPTIONS_EASY_UNLOCK_SETUP_BUTTON }, |
252 { "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO }, | 260 { "easyUnlockSetupIntro", IDS_OPTIONS_EASY_UNLOCK_SETUP_INTRO, |
| 261 device_type_resource_id }, |
253 { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED }, | 262 { "extensionControlled", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED }, |
254 { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE }, | 263 { "extensionDisable", IDS_OPTIONS_TAB_EXTENSION_CONTROLLED_DISABLE }, |
255 { "fontSettingsCustomizeFontsButton", | 264 { "fontSettingsCustomizeFontsButton", |
256 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, | 265 IDS_OPTIONS_FONTSETTINGS_CUSTOMIZE_FONTS_BUTTON }, |
257 { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM }, | 266 { "fontSizeLabelCustom", IDS_OPTIONS_FONT_SIZE_LABEL_CUSTOM }, |
258 { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE }, | 267 { "fontSizeLabelLarge", IDS_OPTIONS_FONT_SIZE_LABEL_LARGE }, |
259 { "fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM }, | 268 { "fontSizeLabelMedium", IDS_OPTIONS_FONT_SIZE_LABEL_MEDIUM }, |
260 { "fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL }, | 269 { "fontSizeLabelSmall", IDS_OPTIONS_FONT_SIZE_LABEL_SMALL }, |
261 { "fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE }, | 270 { "fontSizeLabelVeryLarge", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_LARGE }, |
262 { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL }, | 271 { "fontSizeLabelVerySmall", IDS_OPTIONS_FONT_SIZE_LABEL_VERY_SMALL }, |
(...skipping 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1874 extension = extensions::GetExtensionOverridingProxy( | 1883 extension = extensions::GetExtensionOverridingProxy( |
1875 Profile::FromWebUI(web_ui())); | 1884 Profile::FromWebUI(web_ui())); |
1876 AppendExtensionData("proxy", extension, &extension_controlled); | 1885 AppendExtensionData("proxy", extension, &extension_controlled); |
1877 | 1886 |
1878 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", | 1887 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", |
1879 extension_controlled); | 1888 extension_controlled); |
1880 #endif // defined(OS_WIN) | 1889 #endif // defined(OS_WIN) |
1881 } | 1890 } |
1882 | 1891 |
1883 } // namespace options | 1892 } // namespace options |
OLD | NEW |