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

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

Issue 2862613003: md settings: Show lock screen when pin/fingerprint disabled. (Closed)
Patch Set: Fix patch set 2 errors. 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 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 796
797 chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get(); 797 chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
798 bool allow_bluetooth = true; 798 bool allow_bluetooth = true;
799 cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth); 799 cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth);
800 values->SetBoolean("allowBluetooth", allow_bluetooth); 800 values->SetBoolean("allowBluetooth", allow_bluetooth);
801 801
802 values->SetBoolean("showQuickUnlockSettings", 802 values->SetBoolean("showQuickUnlockSettings",
803 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())); 803 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs()));
804 values->SetBoolean("fingerprintUnlockEnabled", 804 values->SetBoolean("fingerprintUnlockEnabled",
805 chromeos::quick_unlock::IsFingerprintEnabled()); 805 chromeos::quick_unlock::IsFingerprintEnabled());
806 values->SetBoolean("pinUnlockEnabled", 806 values->SetBoolean("quickUnlockEnabled",
807 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())); 807 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs()));
808 if (chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())) { 808 if (chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())) {
809 values->SetString( 809 values->SetString(
810 "enableScreenlock", 810 "enableScreenlock",
811 l10n_util::GetStringUTF16( 811 l10n_util::GetStringUTF16(
812 IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX_WITH_QUICK_UNLOCK)); 812 IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX_WITH_QUICK_UNLOCK));
813 } else { 813 } else {
814 values->SetString( 814 values->SetString(
815 "enableScreenlock", 815 "enableScreenlock",
816 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX)); 816 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX));
(...skipping 1533 matching lines...) Expand 10 before | Expand all | Expand 10 after
2350 2350
2351 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2351 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2352 #if defined(OS_CHROMEOS) 2352 #if defined(OS_CHROMEOS)
2353 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2353 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2354 #else 2354 #else
2355 return true; 2355 return true;
2356 #endif 2356 #endif
2357 } 2357 }
2358 2358
2359 } // namespace options 2359 } // namespace options
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/people_page/people_page.js ('k') | chrome/browser/ui/webui/settings/md_settings_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698