[Mac] Remove ProfileMenuButton now that AvatarButton exists.

chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

 // Copyright (c) 2011 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 "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include <limits>
 #include <string>
@@ skipping 14 matching lines @@
 #include "chrome/browser/sidebar/sidebar_container.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/tabs/tab_strip_selection_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/constrained_window_mac.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/new_tab_button.h"
-#import "chrome/browser/ui/cocoa/profile_menu_button.h"
 #import "chrome/browser/ui/cocoa/tab_contents/favicon_util.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_drag_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/tabs/throbber_view.h"
 #import "chrome/browser/ui/cocoa/tracking_area.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
@@ skipping 219 matching lines @@
   strip_ = nil;
   controller_ = nil;
 }
 
 - (void)animationDidStop:(CAAnimation*)animation finished:(BOOL)finished {
   [strip_ animationDidStopForController:controller_ finished:finished];
 }
 
 @end
 
-namespace TabStripControllerInternal {
-
-// Bridges C++ notifications back to the TabStripController.
-class NotificationBridge : public NotificationObserver {
- public:
-  explicit NotificationBridge(TabStripController* controller,
-                              PrefService* prefService)
-      : controller_(controller) {
-    DCHECK(prefService);
-    usernamePref_.Init(prefs::kGoogleServicesUsername, prefService, this);
-  }
-
-  // Overridden from NotificationObserver:
-  virtual void Observe(NotificationType type,
-                       const NotificationSource& source,
-                       const NotificationDetails& details) {
-    DCHECK_EQ(NotificationType::PREF_CHANGED, type.value);
-    std::string* name = Details<std::string>(details).ptr();
-    if (prefs::kGoogleServicesUsername == *name) {
-      [controller_ updateProfileMenuButton];
-      [controller_ layoutTabsWithAnimation:NO regenerateSubviews:NO];
-    }
-  }
-
- private:
-  TabStripController* controller_;  // weak, owns us
-
-  // The Google services user name associated with this BrowserView's profile.
-  StringPrefMember usernamePref_;
-};
-
-} // namespace TabStripControllerInternal
-
 #pragma mark -
 
 // In general, there is a one-to-one correspondence between TabControllers,
 // TabViews, TabContentsControllers, and the TabContents in the TabStripModel.
 // In the steady-state, the indices line up so an index coming from the model
 // is directly mapped to the same index in the parallel arrays holding our
 // views and controllers. This is also true when new tabs are created (even
 // though there is a small period of animation) because the tab is present
 // in the model while the TabView is animating into place. As a result, nothing
 // special need be done to handle "new tab" animation.
@@ skipping 59 matching lines @@
 
     // TODO(viettrungluu): WTF? "For some reason, if the view is present in the
     // nib a priori, it draws correctly. If we create it in code and add it to
     // the tab view, it draws with all sorts of crazy artifacts."
     newTabButton_ = [view getNewTabButton];
     [self addSubviewToPermanentList:newTabButton_];
     [newTabButton_ setTarget:nil];
     [newTabButton_ setAction:@selector(commandDispatch:)];
     [newTabButton_ setTag:IDC_NEW_TAB];
 
-    profileMenuButton_ = [view profileMenuButton];
-    [self addSubviewToPermanentList:profileMenuButton_];
-    [self updateProfileMenuButton];
-    // Register pref observers for profile name.
-    notificationBridge_.reset(
-        new TabStripControllerInternal::NotificationBridge(
-            self, browser_->profile()->GetPrefs()));
-
     // Set the images from code because Cocoa fails to find them in our sub
     // bundle during tests.
     [[newTabButton_ cell] setImageID:IDR_NEWTAB_BUTTON
                     forButtonState:image_button_cell::kDefaultState];
     [[newTabButton_ cell] setImageID:IDR_NEWTAB_BUTTON_H
                     forButtonState:image_button_cell::kHoverState];
     [[newTabButton_ cell] setImageID:IDR_NEWTAB_BUTTON_P
                     forButtonState:image_button_cell::kPressedState];
     newTabButtonShowingHoverImage_ = NO;
     newTabTrackingArea_.reset(
@@ skipping 669 matching lines @@
         }
         [[newTabButton_ animator] setFrame:newTabNewFrame];
         newTabTargetFrame_ = newTabNewFrame;
       } else {
         [newTabButton_ setFrame:newTabNewFrame];
         newTabTargetFrame_ = newTabNewFrame;
       }
     }
   }
 
-  if (profileMenuButton_ && ![profileMenuButton_ isHidden]) {
-    CGFloat maxX;
-    if ([newTabButton_ isHidden]) {
-      maxX = std::max(offset, NSMaxX(placeholderFrame_) - kTabOverlap);
-    } else {
-      maxX = NSMaxX(newTabTargetFrame_);
-    }
-    NSRect profileMenuButtonFrame = [profileMenuButton_ frame];
-    NSSize minSize = [profileMenuButton_ minControlSize];
-
-    // Make room for the full screen button if necessary.
-    if (!hasUpdatedProfileMenuButtonXOffset_) {
-      hasUpdatedProfileMenuButtonXOffset_ = YES;
-      if ([[profileMenuButton_ window]
-          respondsToSelector:@selector(toggleFullScreen:)]) {
-        NSButton* fullscreenButton = [[profileMenuButton_ window]
-            standardWindowButton:NSWindowFullScreenButton];
-        if (fullscreenButton) {
-          profileMenuButtonFrame.origin.x = NSMinX([fullscreenButton frame]) -
-              NSWidth(profileMenuButtonFrame) - kProfileMenuButtonOffset;
-        }
-      }
-    }
-
-    // TODO(sail): Animate this.
-    CGFloat availableWidth = NSMaxX(profileMenuButtonFrame) - maxX -
-                             kProfileMenuButtonOffset;
-    if (availableWidth > minSize.width) {
-      [profileMenuButton_ setShouldShowProfileDisplayName:YES];
-    } else {
-      [profileMenuButton_ setShouldShowProfileDisplayName:NO];
-    }
-
-    NSSize desiredSize = [profileMenuButton_ desiredControlSize];
-    NSRect rect;
-    rect.size.width = std::min(desiredSize.width,
-                               std::max(availableWidth, minSize.width));
-    rect.size.height = desiredSize.height;
-    rect.origin.y = NSMaxY(profileMenuButtonFrame) - rect.size.height;
-    rect.origin.x = NSMaxX(profileMenuButtonFrame) - rect.size.width;
-    [profileMenuButton_ setFrame:rect];
-  }
-
   [dragBlockingView_ setFrame:enclosingRect];
 
   // Mark that we've successfully completed layout of at least one tab.
   initialLayoutComplete_ = YES;
 }
 
 // When we're told to layout from the public API we usually want to animate,
 // except when it's the first time.
 - (void)layoutTabs {
   [self layoutTabsWithAnimation:initialLayoutComplete_ regenerateSubviews:YES];
@@ skipping 981 matching lines @@
   NSInteger modelIndex = [self modelIndexForContentsView:tabContentsView];
   NSInteger index = [self indexFromModelIndex:modelIndex];
   BrowserWindowController* controller =
       (BrowserWindowController*)[[switchView_ window] windowController];
   DCHECK(index >= 0);
   if (index >= 0) {
     [controller setTab:[self viewAtIndex:index] isDraggable:YES];
   }
 }
 
-- (BOOL)shouldShowProfileMenuButton {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles))
-    return NO;
-  if (browser_->profile()->IsOffTheRecord())
-    return NO;
-  return (!browser_->profile()->GetPrefs()->GetString(
-        prefs::kGoogleServicesUsername).empty());
-}
-
-- (void)updateProfileMenuButton {
-  if (![self shouldShowProfileMenuButton]) {
-    [profileMenuButton_ setHidden:YES];
-    return;
-  }
-
-  std::string profileName = browser_->profile()->GetPrefs()->GetString(
-      prefs::kGoogleServicesUsername);
-  [profileMenuButton_ setProfileDisplayName:
-      [NSString stringWithUTF8String:profileName.c_str()]];
-  [profileMenuButton_ setHidden:NO];
-}
-
 @end