Chromium Code Reviews| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <set> | 9 #include <set> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 433 { "accessibilitySwitchAccess", | 433 { "accessibilitySwitchAccess", |
| 434 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION }, | 434 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION }, |
| 435 { "accessibilityTalkBackSettings", | 435 { "accessibilityTalkBackSettings", |
| 436 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TALKBACK_SETTINGS }, | 436 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TALKBACK_SETTINGS }, |
| 437 { "accessibilityTapDragging", | 437 { "accessibilityTapDragging", |
| 438 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, | 438 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, |
| 439 { "accessibilityVirtualKeyboard", | 439 { "accessibilityVirtualKeyboard", |
| 440 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, | 440 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, |
| 441 { "accessibilityMonoAudio", | 441 { "accessibilityMonoAudio", |
| 442 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION}, | 442 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION}, |
| 443 { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE }, | |
| 444 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE }, | 443 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE }, |
| 445 { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS }, | 444 { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS }, |
| 446 { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE }, | 445 { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE }, |
| 447 { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER }, | 446 { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER }, |
| 448 { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION }, | 447 { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION }, |
| 449 { "arcOptOutDialogButtonConfirmDisable", | 448 { "arcOptOutDialogButtonConfirmDisable", |
| 450 IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE }, | 449 IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE }, |
| 451 { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL }, | 450 { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL }, |
| 452 { "autoclickDelayExtremelyShort", | 451 { "autoclickDelayExtremelyShort", |
| 453 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, | 452 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 564 | 563 |
| 565 RegisterStrings(values, resources, arraysize(resources)); | 564 RegisterStrings(values, resources, arraysize(resources)); |
| 566 RegisterTitle(values, "doNotTrackConfirmOverlay", | 565 RegisterTitle(values, "doNotTrackConfirmOverlay", |
| 567 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE); | 566 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE); |
| 568 RegisterTitle(values, "spellingConfirmOverlay", | 567 RegisterTitle(values, "spellingConfirmOverlay", |
| 569 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE); | 568 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE); |
| 570 #if defined(ENABLE_PRINT_PREVIEW) | 569 #if defined(ENABLE_PRINT_PREVIEW) |
| 571 RegisterCloudPrintValues(values); | 570 RegisterCloudPrintValues(values); |
| 572 #endif | 571 #endif |
| 573 | 572 |
| 573 #if defined(OS_CHROMEOS) | |
| 574 std::string androidAppsTitle = | |
|
xiyuan
2016/09/08 18:01:29
nit: Put a TODO to remove this after merging it to
xdai1
2016/09/08 21:49:02
Done. Thanks for reviewing!
| |
| 575 l10n_util::GetStringUTF8(IDS_OPTIONS_ARC_TITLE) + " (" + | |
| 576 l10n_util::GetStringUTF8(IDS_ABOUT_PAGE_CURRENT_CHANNEL_BETA) + ")"; | |
| 577 values->SetString("androidAppsTitle", androidAppsTitle); | |
| 578 #endif | |
| 579 | |
| 574 values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL); | 580 values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL); |
| 575 base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL); | 581 base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL); |
| 576 values->SetString( | 582 values->SetString( |
| 577 "defaultSearchGroupLabel", | 583 "defaultSearchGroupLabel", |
| 578 l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url)); | 584 l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url)); |
| 579 values->SetString("hotwordLearnMoreURL", chrome::kHotwordLearnMoreURL); | 585 values->SetString("hotwordLearnMoreURL", chrome::kHotwordLearnMoreURL); |
| 580 RegisterTitle(values, "hotwordConfirmOverlay", | 586 RegisterTitle(values, "hotwordConfirmOverlay", |
| 581 IDS_HOTWORD_CONFIRM_BUBBLE_TITLE); | 587 IDS_HOTWORD_CONFIRM_BUBBLE_TITLE); |
| 582 values->SetString("hotwordManageAudioHistoryURL", | 588 values->SetString("hotwordManageAudioHistoryURL", |
| 583 chrome::kManageAudioHistoryURL); | 589 chrome::kManageAudioHistoryURL); |
| (...skipping 1648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2232 | 2238 |
| 2233 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { | 2239 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { |
| 2234 #if defined(OS_CHROMEOS) | 2240 #if defined(OS_CHROMEOS) |
| 2235 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); | 2241 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); |
| 2236 #else | 2242 #else |
| 2237 return true; | 2243 return true; |
| 2238 #endif | 2244 #endif |
| 2239 } | 2245 } |
| 2240 | 2246 |
| 2241 } // namespace options | 2247 } // namespace options |
| OLD | NEW |