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

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: Use offset width 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 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 {"lockScreenNumberFingerprints", 542 {"lockScreenNumberFingerprints",
543 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS}, 543 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NUM_FINGERPRINTS},
544 {"lockScreenFingerprintEnable", 544 {"lockScreenFingerprintEnable",
545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL}, 545 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_ENABLE_FINGERPRINT_CHECKBOX_LABEL},
546 {"lockScreenFingerprintNewName", 546 {"lockScreenFingerprintNewName",
547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME}, 547 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NEW_FINGERPRINT_DEFAULT_NAME},
548 {"lockScreenFingerprintTitle", 548 {"lockScreenFingerprintTitle",
549 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE}, 549 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_SUBPAGE_TITLE},
550 {"lockScreenFingerprintWarning", 550 {"lockScreenFingerprintWarning",
551 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE}, 551 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_FINGERPRINT_LESS_SECURE},
552 {"lockScreenHighSecurity", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_HIGH_SECURITY},
553 {"lockScreenMediumSecurity",
554 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_MEDIUM_SECURITY},
552 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE}, 555 {"lockScreenNone", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_NONE},
553 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY}, 556 {"lockScreenPasswordOnly", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PASSWORD_ONLY},
554 {"lockScreenPinOrPassword", 557 {"lockScreenPinOrPassword",
555 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD}, 558 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_PIN_OR_PASSWORD},
556 {"lockScreenRegisteredFingerprints", 559 {"lockScreenRegisteredFingerprints",
557 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL}, 560 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_REGISTERED_FINGERPRINTS_LABEL},
558 {"lockScreenSetupPinButton", 561 {"lockScreenSetupPinButton",
559 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON}, 562 IDS_SETTINGS_PEOPLE_LOCK_SCREEN_SETUP_PIN_BUTTON},
560 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE}, 563 {"lockScreenTitle", IDS_SETTINGS_PEOPLE_LOCK_SCREEN_TITLE},
561 {"passwordPromptEnterPassword", 564 {"passwordPromptEnterPassword",
(...skipping 1785 matching lines...) Expand 10 before | Expand all | Expand 10 after
2347 2350
2348 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2351 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2349 #if defined(OS_CHROMEOS) 2352 #if defined(OS_CHROMEOS)
2350 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2353 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2351 #else 2354 #else
2352 return true; 2355 return true;
2353 #endif 2356 #endif
2354 } 2357 }
2355 2358
2356 } // namespace options 2359 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698