Change semantics of newProfileManagement() to accountConsistency()

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/prefs/pref_service.h"
@@ skipping 1081 matching lines @@
     yOffset += kVerticalSpacing;
     [currentProfileView setFrameOrigin:NSMakePoint(0, yOffset)];
     [container addSubview:currentProfileView];
     yOffset = NSMaxY([currentProfileView frame]) + kVerticalSpacing;
   }
 
   if (tutorialView) {
     [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);
     }
   } else {
     tutorialMode_ = profiles::TUTORIAL_MODE_NONE;
   }
 
   [container setFrameSize:NSMakeSize(kFixedMenuWidth, yOffset)];
   return container.autorelease();
 }
 
 - (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
                           linkMessage:IDS_PROFILES_PROFILE_TUTORIAL_LEARN_MORE
                         buttonMessage:IDS_PROFILES_TUTORIAL_TRY_BUTTON
                            linkAction:@selector(openTutorialLearnMoreURL:)
                          buttonAction:
         @selector(enableNewProfileManagementPreview:)];
   }
 
@@ skipping 35 matching lines @@
                        buttonAction:@selector(dismissTutorial:)];
 }
 
 - (NSView*)tutorialViewWithMode:(profiles::TutorialMode)mode
                    titleMessage:(int)titleMessageId
                  contentMessage:(int)contentMessageId
                     linkMessage:(int)linkMessageId
                   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 =
       gfx::SkColorToSRGBNSColor(profiles::kAvatarTutorialBackgroundColor);
   base::scoped_nsobject<NSView> container([[BackgroundColorView alloc]
       initWithFrame:NSMakeRect(0, 0, kFixedMenuWidth, 0)
           withColor:tutorialBackgroundColor]);
   CGFloat availableWidth = kFixedMenuWidth - 2 * kHorizontalSpacing;
   CGFloat yOffset = kSmallVerticalSpacing;
 
@@ skipping 175 matching lines @@
 - (NSView*)createCurrentProfileLinksForItem:(const AvatarMenu::Item&)item
                                        rect:(NSRect)rect {
   base::scoped_nsobject<NSView> container([[NSView alloc] initWithFrame:rect]);
 
   // Don't double-apply the left margin to the sub-views.
   rect.origin.x = 0;
 
   // 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 :
               IDS_PROFILES_PROFILE_HIDE_MANAGE_ACCOUNTS_BUTTON);
       SEL linkSelector =
           (viewMode_ == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER) ?
           @selector(showAccountManagement:) : @selector(hideAccountManagement:);
       link = [self linkButtonWithTitle:linkTitle
                            frameOrigin:rect.origin
                                 action:linkSelector];
@@ skipping 513 matching lines @@
 
   return button.autorelease();
 }
 
 - (void)postActionPerformed:(ProfileMetrics::ProfileDesktopMenu)action {
   ProfileMetrics::LogProfileDesktopMenu(action, serviceType_);
   serviceType_ = signin::GAIA_SERVICE_TYPE_NONE;
 }
 
 @end