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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 2327803003: [Merge to M53] [ARC] Add "(beta)" string to Play Store. (Closed)
Patch Set: Created 4 years, 3 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc ('k') | no next file » | 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) 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 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 { "accessibilityStickyKeys", 434 { "accessibilityStickyKeys",
435 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION }, 435 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_STICKY_KEYS_DESCRIPTION },
436 { "accessibilitySwitchAccess", 436 { "accessibilitySwitchAccess",
437 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION }, 437 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION },
438 { "accessibilityTapDragging", 438 { "accessibilityTapDragging",
439 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, 439 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
440 { "accessibilityVirtualKeyboard", 440 { "accessibilityVirtualKeyboard",
441 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, 441 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
442 { "accessibilityMonoAudio", 442 { "accessibilityMonoAudio",
443 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION}, 443 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION},
444 { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE },
445 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE }, 444 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE },
446 { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS }, 445 { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS },
447 { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE }, 446 { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE },
448 { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER }, 447 { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER },
449 { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION }, 448 { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION },
450 { "arcOptOutDialogButtonConfirmDisable", 449 { "arcOptOutDialogButtonConfirmDisable",
451 IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE }, 450 IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE },
452 { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL }, 451 { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL },
453 { "autoclickDelayExtremelyShort", 452 { "autoclickDelayExtremelyShort",
454 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, 453 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT },
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 566
568 RegisterStrings(values, resources, arraysize(resources)); 567 RegisterStrings(values, resources, arraysize(resources));
569 RegisterTitle(values, "doNotTrackConfirmOverlay", 568 RegisterTitle(values, "doNotTrackConfirmOverlay",
570 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE); 569 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE);
571 RegisterTitle(values, "spellingConfirmOverlay", 570 RegisterTitle(values, "spellingConfirmOverlay",
572 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE); 571 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE);
573 #if defined(ENABLE_PRINT_PREVIEW) 572 #if defined(ENABLE_PRINT_PREVIEW)
574 RegisterCloudPrintValues(values); 573 RegisterCloudPrintValues(values);
575 #endif 574 #endif
576 575
576 // TODO(xdai): Revert this after it's merged to M53.
577 #if defined(OS_CHROMEOS)
578 std::string android_apps_title =
579 l10n_util::GetStringUTF8(IDS_OPTIONS_ARC_TITLE) + " (" +
580 l10n_util::GetStringUTF8(IDS_ABOUT_PAGE_CURRENT_CHANNEL_BETA) + ")";
581 values->SetString("androidAppsTitle", android_apps_title);
582 #endif
583
577 values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL); 584 values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL);
578 base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL); 585 base::string16 omnibox_url = base::ASCIIToUTF16(chrome::kOmniboxLearnMoreURL);
579 values->SetString( 586 values->SetString(
580 "defaultSearchGroupLabel", 587 "defaultSearchGroupLabel",
581 l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url)); 588 l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url));
582 values->SetString("hotwordLearnMoreURL", chrome::kHotwordLearnMoreURL); 589 values->SetString("hotwordLearnMoreURL", chrome::kHotwordLearnMoreURL);
583 RegisterTitle(values, "hotwordConfirmOverlay", 590 RegisterTitle(values, "hotwordConfirmOverlay",
584 IDS_HOTWORD_CONFIRM_BUBBLE_TITLE); 591 IDS_HOTWORD_CONFIRM_BUBBLE_TITLE);
585 values->SetString("hotwordManageAudioHistoryURL", 592 values->SetString("hotwordManageAudioHistoryURL",
586 chrome::kManageAudioHistoryURL); 593 chrome::kManageAudioHistoryURL);
(...skipping 1641 matching lines...) Expand 10 before | Expand all | Expand 10 after
2228 2235
2229 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2236 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2230 #if defined(OS_CHROMEOS) 2237 #if defined(OS_CHROMEOS)
2231 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2238 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2232 #else 2239 #else
2233 return true; 2240 return true;
2234 #endif 2241 #endif
2235 } 2242 }
2236 2243
2237 } // namespace options 2244 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_list_prefs.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698