chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc - Issue 2236213002: Add quick unlock Settings in options page

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc

Issue 2236213002: Add quick unlock Settings in options page (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix browser test2 Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/resources/options/browser_options.js » ('j') | chrome/browser/resources/options/chromeos/quick_unlock_configure_overlay.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc

diff --git a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc

index d9f6a03b730619f769d3aefdef18ccb1ee6b1d03..0e397088e50f58bde2208e4905af4d86fc924c7d 100644

--- a/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc

+++ b/chrome/browser/chromeos/extensions/quick_unlock_private/quick_unlock_private_api.cc

@@ -34,9 +34,8 @@ QuickUnlockModeList ComputeActiveModes(Profile* profile) {

chromeos::PinStorage* pin_storage =

chromeos::PinStorageFactory::GetForProfile(profile);

- if (pin_storage->IsPinSet())

+ if (pin_storage && pin_storage->IsPinSet())

modes.push_back(quick_unlock_private::QUICK_UNLOCK_MODE_PIN);

return modes;

}