chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm - Issue 372033002: Change semantics of newProfileManagement() to accountConsistency()

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/ui/cocoa/profiles/profile_chooser_controller.mm

Issue 372033002: Change semantics of newProfileManagement() to accountConsistency() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix profile_chooser_controller_test Created 6 years, 5 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/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

index d9775a20dda5fa6b87ed2e897a21b0fc8629245e..be691306cce0a75d64fb91c943d2c3f766f116c0 100644

--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm

@@ -1099,7 +1099,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

[tutorialView setFrameOrigin:NSMakePoint(0, yOffset)];

[container addSubview:tutorialView];

yOffset = NSMaxY([tutorialView frame]);

- if (!switches::IsNewProfileManagement() &&

+ if (!switches::IsEnableAccountConsistency() &&

tutorialMode_ != lastTutorialMode) {

ProfileMetrics::LogProfileUpgradeEnrollment(

ProfileMetrics::PROFILE_ENROLLMENT_SHOW_PREVIEW_PROMO);

@@ -1113,7 +1113,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

}

- (NSView*)buildPreviewTutorialIfNeeded:(const AvatarMenu::Item&)item {

- if (!switches::IsNewProfileManagement()) {

+ if (!switches::IsEnableAccountConsistency()) {

return [self tutorialViewWithMode:profiles::TUTORIAL_MODE_ENABLE_PREVIEW

titleMessage:IDS_PROFILES_PREVIEW_TUTORIAL_TITLE

contentMessage:IDS_PROFILES_PREVIEW_TUTORIAL_CONTENT_TEXT

@@ -1169,6 +1169,10 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

buttonMessage:(int)buttonMessageId

linkAction:(SEL)linkAction

buttonAction:(SEL)buttonAction {

+ // No promotion to Enable Accounst Consistency.

+ if (mode == profiles::TUTORIAL_MODE_ENABLE_PREVIEW)

+ return nil;

tutorialMode_ = mode;

NSColor* tutorialBackgroundColor =

@@ -1364,7 +1368,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,

// The available links depend on the type of profile that is active.

NSButton* link;

if (item.signed_in) {

- if (switches::IsNewProfileManagement()) {

+ if (switches::IsEnableAccountConsistency()) {

NSString* linkTitle = l10n_util::GetNSString(

viewMode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ?

IDS_PROFILES_PROFILE_MANAGE_ACCOUNTS_BUTTON :