chrome/browser/signin/screenlock_bridge.cc - Issue 668213003: Reauthenticate the user before launching Smart Lock setup app.

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/signin/screenlock_bridge.cc

Issue 668213003: Reauthenticate the user before launching Smart Lock setup app. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixes + git cl format Created 6 years, 1 month 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/browser/signin/easy_unlock_service_regular.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/signin/screenlock_bridge.cc

diff --git a/chrome/browser/signin/screenlock_bridge.cc b/chrome/browser/signin/screenlock_bridge.cc

index 5fb5192ab165302b64d49dc46808e1f4550ba2c0..c2d7224ba7b82fea8540fb2872c84f3e909e0ac2 100644

--- a/chrome/browser/signin/screenlock_bridge.cc

+++ b/chrome/browser/signin/screenlock_bridge.cc

@@ -62,9 +62,6 @@ scoped_ptr<base::DictionaryValue>

ScreenlockBridge::UserPodCustomIconOptions::ToDictionaryValue() const {

scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());

std::string icon_id = GetIdForIcon(icon_);

- if (icon_id.empty())

- return result.Pass();

result->SetString("id", icon_id);

if (!tooltip_.empty()) {