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

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

Issue 2691943005: fix quick unlock config in options (Closed)
Patch Set: rebase Created 3 years, 10 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 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
814 814
815 chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get(); 815 chromeos::CrosSettings* cros_settings = chromeos::CrosSettings::Get();
816 bool allow_bluetooth = true; 816 bool allow_bluetooth = true;
817 cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth); 817 cros_settings->GetBoolean(chromeos::kAllowBluetooth, &allow_bluetooth);
818 values->SetBoolean("allowBluetooth", allow_bluetooth); 818 values->SetBoolean("allowBluetooth", allow_bluetooth);
819 819
820 values->SetBoolean("showQuickUnlockSettings", 820 values->SetBoolean("showQuickUnlockSettings",
821 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())); 821 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs()));
822 values->SetBoolean("fingerprintUnlockEnabled", 822 values->SetBoolean("fingerprintUnlockEnabled",
823 chromeos::quick_unlock::IsFingerprintEnabled()); 823 chromeos::quick_unlock::IsFingerprintEnabled());
824 values->SetBoolean("pinUnlockEnabled",
825 chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs()));
824 if (chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())) { 826 if (chromeos::quick_unlock::IsPinEnabled(profile->GetPrefs())) {
825 values->SetString( 827 values->SetString(
826 "enableScreenlock", 828 "enableScreenlock",
827 l10n_util::GetStringUTF16( 829 l10n_util::GetStringUTF16(
828 IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX_WITH_QUICK_UNLOCK)); 830 IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX_WITH_QUICK_UNLOCK));
829 } else { 831 } else {
830 values->SetString( 832 values->SetString(
831 "enableScreenlock", 833 "enableScreenlock",
832 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX)); 834 l10n_util::GetStringUTF16(IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX));
833 } 835 }
(...skipping 1534 matching lines...) Expand 10 before | Expand all | Expand 10 after
2368 2370
2369 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2371 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2370 #if defined(OS_CHROMEOS) 2372 #if defined(OS_CHROMEOS)
2371 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2373 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2372 #else 2374 #else
2373 return true; 2375 return true;
2374 #endif 2376 #endif
2375 } 2377 }
2376 2378
2377 } // namespace options 2379 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698