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

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

Issue 2841313002: md settings: Update lock screen to match new mocks. (Closed)
Patch Set: Rebased. Created 3 years, 7 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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 {"configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG}, 532 {"configurePinTooLong", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_TOO_LONG},
533 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN}, 533 {"configurePinWeakPin", IDS_SETTINGS_PEOPLE_CONFIGURE_PIN_WEAK_PIN},
534 {"lockScreenAddFingerprint", 534 {"lockScreenAddFingerprint",
535 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON}, 535 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ADD_FINGERPRINT_BUTTON},
536 {"lockScreenChangePinButton", 536 {"lockScreenChangePinButton",
537 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON}, 537 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_CHANGE_PIN_BUTTON},
538 {"lockScreenEditFingerprints", 538 {"lockScreenEditFingerprints",
539 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS}, 539 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS},
540 {"lockScreenEditFingerprintsDescription", 540 {"lockScreenEditFingerprintsDescription",
541 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS_DESCRIPTION}, 541 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_EDIT_FINGERPRINTS_DESCRIPTION},
542 {"lockScreenSetupFingerprintButton",
543 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SETUP_BUTTON},
542 {"lockScreenNumberFingerprints", 544 {"lockScreenNumberFingerprints",
543 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS}, 545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS},
544 {"lockScreenFingerprintEnable", 546 {"lockScreenFingerprintEnable",
545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, 547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
546 {"lockScreenFingerprintNewName", 548 {"lockScreenFingerprintNewName",
547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, 549 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
548 {"lockScreenFingerprintTitle", 550 {"lockScreenFingerprintTitle",
549 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE}, 551 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE},
550 {"lockScreenFingerprintWarning", 552 {"lockScreenFingerprintWarning",
551 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, 553 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
552 {"lockScreenHighSecurity", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_HIGH_SECURITY}, 554 {"lockScreenHighSecurity", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_HIGH_SECURITY},
553 {"lockScreenMediumSecurity", 555 {"lockScreenMediumSecurity",
554 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_MEDIUM_SECURITY}, 556 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_MEDIUM_SECURITY},
555 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 557 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
558 {"lockScreenOptions", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS},
556 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 559 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
557 {"lockScreenPinOrPassword", 560 {"lockScreenPinOrPassword",
558 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 561 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
559 {"lockScreenRegisteredFingerprints", 562 {"lockScreenRegisteredFingerprints",
560 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, 563 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
561 {"lockScreenSetupPinButton", 564 {"lockScreenSetupPinButton",
562 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 565 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
563 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE}, 566 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
564 {"passwordPromptEnterPassword", 567 {"passwordPromptEnterPassword",
565 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD}, 568 IDS_SETTINGS_PEOPLE_PASSWORD_PROMPT_ENTER_PASSWORD},
(...skipping 1784 matching lines...) Expand 10 before | Expand all | Expand 10 after
2350 2353
2351 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2354 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2352 #if defined(OS_CHROMEOS) 2355 #if defined(OS_CHROMEOS)
2353 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2356 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2354 #else 2357 #else
2355 return true; 2358 return true;
2356 #endif 2359 #endif
2357 } 2360 }
2358 2361
2359 } // namespace options 2362 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698