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

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

Issue 2885503002: md settings: Remove level of security indicator on lock screen. (Closed)
Patch Set: 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 {"lockScreenNumberFingerprints", 544 {"lockScreenNumberFingerprints",
545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS}, 545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS},
546 {"lockScreenFingerprintEnable", 546 {"lockScreenFingerprintEnable",
547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, 547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
548 {"lockScreenFingerprintNewName", 548 {"lockScreenFingerprintNewName",
549 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, 549 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
550 {"lockScreenFingerprintTitle", 550 {"lockScreenFingerprintTitle",
551 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE}, 551 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE},
552 {"lockScreenFingerprintWarning", 552 {"lockScreenFingerprintWarning",
553 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, 553 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
554 {"lockScreenHighSecurity", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_HIGH_SECURITY},
555 {"lockScreenMediumSecurity",
556 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_MEDIUM_SECURITY},
557 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 554 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
558 {"lockScreenOptions", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS}, 555 {"lockScreenOptions", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_OPTIONS},
559 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 556 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
560 {"lockScreenPinOrPassword", 557 {"lockScreenPinOrPassword",
561 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 558 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
562 {"lockScreenRegisteredFingerprints", 559 {"lockScreenRegisteredFingerprints",
563 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, 560 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
564 {"lockScreenSetupPinButton", 561 {"lockScreenSetupPinButton",
565 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 562 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
566 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE}, 563 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
(...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after
2352 2349
2353 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2350 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2354 #if defined(OS_CHROMEOS) 2351 #if defined(OS_CHROMEOS)
2355 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2352 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2356 #else 2353 #else
2357 return true; 2354 return true;
2358 #endif 2355 #endif
2359 } 2356 }
2360 2357
2361 } // namespace options 2358 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698