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

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

Issue 2318333003: [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
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 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 }, 443 { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE },
444 { "androidAppsTitleBeta", IDS_ABOUT_PAGE_CURRENT_CHANNEL_BETA},
xiyuan 2016/09/07 22:56:36 I think we should append "(beta)" to IDS_OPTIONS_A
xdai1 2016/09/07 23:25:01 Done.
444 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE }, 445 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE },
445 { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS }, 446 { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS },
446 { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE }, 447 { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE },
447 { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER }, 448 { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER },
448 { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION }, 449 { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION },
449 { "arcOptOutDialogButtonConfirmDisable", 450 { "arcOptOutDialogButtonConfirmDisable",
450 IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE }, 451 IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE },
451 { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL }, 452 { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL },
452 { "autoclickDelayExtremelyShort", 453 { "autoclickDelayExtremelyShort",
453 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, 454 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT },
(...skipping 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after
2232 2233
2233 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2234 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2234 #if defined(OS_CHROMEOS) 2235 #if defined(OS_CHROMEOS)
2235 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2236 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2236 #else 2237 #else
2237 return true; 2238 return true;
2238 #endif 2239 #endif
2239 } 2240 }
2240 2241
2241 } // namespace options 2242 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698