chrome/browser/chromeos/profiles/profile_list_chromeos.cc - Issue 340723002: Revert 277793 "Enable consistent identity on android platform by..."

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/profiles/profile_list_chromeos.cc

Issue 340723002: Revert 277793 "Enable consistent identity on android platform by..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2056/src/

Patch Set: Created 6 years, 6 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/browser/app_controller_mac_browsertest.mm ('k') | chrome/browser/extensions/api/screenlock_private/screenlock_private_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/profiles/profile_list_chromeos.cc

===================================================================

--- chrome/browser/chromeos/profiles/profile_list_chromeos.cc (revision 277945)

+++ chrome/browser/chromeos/profiles/profile_list_chromeos.cc (working copy)

@@ -13,7 +13,6 @@

#include "chrome/browser/profiles/profile_avatar_icon_util.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/chrome_switches.h"

-#include "components/signin/core/common/profile_management_switches.h"

// static

ProfileList* ProfileList::Create(ProfileInfoInterface* profile_cache) {

@@ -52,7 +51,8 @@

ProfileHelper::GetProfilePathByUserIdHash((*it)->username_hash()));

gfx::Image icon = gfx::Image((*it)->GetImage());

- if (!switches::IsNewProfileManagement() && !icon.IsEmpty()) {

+ if (!CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kNewProfileManagement) && !icon.IsEmpty()) {

// old avatar menu uses resized-small images

icon = profiles::GetAvatarIconForMenu(icon, true);

}