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

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

Issue 2823713002: md settings: Change action link to button on lock screen. (Closed)
Patch Set: Created 3 years, 8 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 {"lockScreenNumberFingerprints", 540 {"lockScreenNumberFingerprints",
541 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS}, 541 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS},
542 {"lockScreenFingerprintEnable", 542 {"lockScreenFingerprintEnable",
543 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, 543 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
544 {"lockScreenFingerprintNewName", 544 {"lockScreenFingerprintNewName",
545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, 545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
546 {"lockScreenFingerprintTitle", 546 {"lockScreenFingerprintTitle",
547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE}, 547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE},
548 {"lockScreenFingerprintWarning", 548 {"lockScreenFingerprintWarning",
549 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, 549 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
550 {"lockScreenHighSecurity", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_HIGH_SECURITY},
551 {"lockScreenMediumSecurity",
552 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_MEDIUM_SECURITY},
550 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 553 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
551 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 554 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
552 {"lockScreenPinOrPassword", 555 {"lockScreenPinOrPassword",
553 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 556 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
554 {"lockScreenRegisteredFingerprints", 557 {"lockScreenRegisteredFingerprints",
555 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, 558 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
556 {"lockScreenSetupPinButton", 559 {"lockScreenSetupPinButton",
557 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 560 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
558 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE}, 561 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
559 {"passwordPromptEnterPassword", 562 {"passwordPromptEnterPassword",
(...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after
2345 2348
2346 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2349 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2347 #if defined(OS_CHROMEOS) 2350 #if defined(OS_CHROMEOS)
2348 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2351 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2349 #else 2352 #else
2350 return true; 2353 return true;
2351 #endif 2354 #endif
2352 } 2355 }
2353 2356
2354 } // namespace options 2357 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698