Removing pre-material design menu setting.

chrome/browser/ui/cocoa/profiles/avatar_button_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 "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/vector_icons/vector_icons.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 82 matching lines @@
   NSRect frameAfterPadding = NSInsetRect(frame, kButtonExtraPadding, 0);
   [super drawInteriorWithFrame:frameAfterPadding inView:controlView];
 }
 
 - (void)drawImage:(NSImage*)image
         withFrame:(NSRect)frame
            inView:(NSView*)controlView {
   // The image used in the generic button case as well as the error icon both
   // need to be shifted down slightly to be centered correctly.
   // TODO(noms): When the assets are fixed, remove this latter offset.
-  if (!hasError_ || switches::IsMaterialDesignUserMenu())
-    frame = NSOffsetRect(frame, 0, 1);
+  frame = NSOffsetRect(frame, 0, 1);
   [super drawImage:image withFrame:frame inView:controlView];
 }
 
 - (void)drawBezelWithFrame:(NSRect)frame
                     inView:(NSView*)controlView {
   AvatarButton* button = base::mac::ObjCCastStrict<AvatarButton>(controlView);
   HoverState hoverState = [button hoverState];
 
   NSColor* backgroundColor = nil;
   if (hoverState == kHoverStateMouseDown || [button isActive]) {
@@ skipping 60 matching lines @@
     base::scoped_nsobject<NSButtonCell> cell(
         [[CustomThemeButtonCell alloc] initWithThemedWindow:isThemedWindow_]);
 
     [avatarButton setCell:cell.get()];
 
     [avatarButton setWantsLayer:YES];
     [self setView:avatarButton];
 
     [avatarButton setBezelStyle:NSShadowlessSquareBezelStyle];
     [avatarButton setButtonType:NSMomentaryChangeButton];
-    if (switches::IsMaterialDesignUserMenu())
-      [[avatarButton cell] setHighlightsBy:NSNoCellMask];
+    [[avatarButton cell] setHighlightsBy:NSNoCellMask];
     [avatarButton setBordered:YES];
 
     if (cocoa_l10n_util::ShouldFlipWindowControlsInRTL())
       [avatarButton setAutoresizingMask:NSViewMaxXMargin | NSViewMinYMargin];
     else
       [avatarButton setAutoresizingMask:NSViewMinXMargin | NSViewMinYMargin];
     [avatarButton setTarget:self];
     [avatarButton setAction:@selector(buttonClicked:)];
     [avatarButton setRightAction:@selector(buttonClicked:)];
 
@@ skipping 147 matching lines @@
 }
 
 - (void)bubbleWillClose:(NSNotification*)notif {
   AvatarButton* button = base::mac::ObjCCastStrict<AvatarButton>(button_);
   [button setIsActive:NO];
   [self updateAvatarButtonAndLayoutParent:NO];
   [super bubbleWillClose:notif];
 }
 
 @end