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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Created 6 years, 2 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
« chrome/browser/signin/easy_unlock_service_regular.cc ('K') | « chrome/browser/signin/easy_unlock_service_regular.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | ui/login/account_picker/user_pod_row.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 a78d2613a24a3678d35844b720d93abde52179b1..eb51ad8803fcea7118dc13bbb9c1828470d3bde2 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()) {
« chrome/browser/signin/easy_unlock_service_regular.cc ('K') | « chrome/browser/signin/easy_unlock_service_regular.cc ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc » ('j') | ui/login/account_picker/user_pod_row.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698