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

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: fix css copy detection 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
« no previous file with comments | « chrome/browser/resources/options/options.js ('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 10
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION }, 435 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_SWITCH_ACCESS_DESCRIPTION },
436 { "accessibilityTapDragging", 436 { "accessibilityTapDragging",
437 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION }, 437 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_TOUCHPAD_TAP_DRAGGING_DESCRIPTION },
438 { "accessibilityVirtualKeyboard", 438 { "accessibilityVirtualKeyboard",
439 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION }, 439 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_VIRTUAL_KEYBOARD_DESCRIPTION },
440 { "accessibilityMonoAudio", 440 { "accessibilityMonoAudio",
441 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION}, 441 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_MONO_AUDIO_DESCRIPTION},
442 { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE }, 442 { "androidAppsTitle", IDS_OPTIONS_ARC_TITLE },
443 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE }, 443 { "androidAppsEnabled", IDS_OPTIONS_ARC_ENABLE },
444 { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS }, 444 { "androidAppsSettingsLabel", IDS_OPTIONS_ARC_MANAGE_APPS },
445 { "arcOptOutConfirmOverlayTabTitle", IDS_ARC_OPT_OUT_TAB_TITLE },
446 { "arcOptOutDialogHeader", IDS_ARC_OPT_OUT_DIALOG_HEADER },
447 { "arcOptOutDialogDescription", IDS_ARC_OPT_OUT_DIALOG_DESCRIPTION },
448 { "arcOptOutDialogButtonConfirmDisable",
449 IDS_ARC_OPT_OUT_DIALOG_BUTTON_CONFIRM_DISABLE },
450 { "arcOptOutDialogButtonCancel", IDS_ARC_OPT_OUT_DIALOG_BUTTON_CANCEL },
445 { "autoclickDelayExtremelyShort", 451 { "autoclickDelayExtremelyShort",
446 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT }, 452 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_EXTREMELY_SHORT },
447 { "autoclickDelayLong", 453 { "autoclickDelayLong",
448 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG }, 454 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_LONG },
449 { "autoclickDelayShort", 455 { "autoclickDelayShort",
450 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT }, 456 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_SHORT },
451 { "autoclickDelayVeryLong", 457 { "autoclickDelayVeryLong",
452 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG }, 458 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_LONG },
453 { "autoclickDelayVeryShort", 459 { "autoclickDelayVeryShort",
454 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT }, 460 IDS_OPTIONS_SETTINGS_ACCESSIBILITY_AUTOCLICK_DELAY_VERY_SHORT },
(...skipping 1729 matching lines...) Expand 10 before | Expand all | Expand 10 after
2184 2190
2185 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2191 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2186 #if defined(OS_CHROMEOS) 2192 #if defined(OS_CHROMEOS)
2187 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2193 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2188 #else 2194 #else
2189 return true; 2195 return true;
2190 #endif 2196 #endif
2191 } 2197 }
2192 2198
2193 } // namespace options 2199 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/options.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698