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

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

Issue 2002253004: Add warning message when disabling ARC. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert unrelated changes by git cl format Created 4 years, 6 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 10
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 { "accessibilitySwitchAccess", 433 { "accessibilitySwitchAccess",
434 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION }, 434 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION },
435 { "accessibilityTapDragging", 435 { "accessibilityTapDragging",
436 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, 436 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
437 { "accessibilityVirtualKeyboard", 437 { "accessibilityVirtualKeyboard",
438 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, 438 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
439 { "accessibilityMonoAudio", 439 { "accessibilityMonoAudio",
440 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION}, 440 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION},
441 { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE }, 441 { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE },
442 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE }, 442 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE },
443 { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE },
444 { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER },
445 { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION },
446 { "arcOptOutDialogButtonConfirmDisable",
447 IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE },
448 { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL },
443 { "autoclickDelayExtremelyShort", 449 { "autoclickDelayExtremelyShort",
444 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, 450 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT },
445 { "autoclickDelayLong", 451 { "autoclickDelayLong",
446 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG }, 452 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG },
447 { "autoclickDelayShort", 453 { "autoclickDelayShort",
448 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT }, 454 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT },
449 { "autoclickDelayVeryLong", 455 { "autoclickDelayVeryLong",
450 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG }, 456 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
451 { "autoclickDelayVeryShort", 457 { "autoclickDelayVeryShort",
452 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT }, 458 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
(...skipping 1726 matching lines...) Expand 10 before | Expand all | Expand 10 after
2179 2185
2180 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2186 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2181 #if defined(OS_CHROMEOS) 2187 #if defined(OS_CHROMEOS)
2182 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2188 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2183 #else 2189 #else
2184 return true; 2190 return true;
2185 #endif 2191 #endif
2186 } 2192 }
2187 2193
2188 } // namespace options 2194 } // namespace options
OLDNEW
« chrome/app/chromeos_strings.grdp ('K') | « chrome/browser/resources/options/options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698