Start untangling the avatar switcher from BrowserNonClientFrameView

chrome/browser/ui/views/profiles/new_avatar_button.cc

 // 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.
 
 #include "chrome/browser/ui/views/profiles/new_avatar_button.h"
 
 #include <utility>
 
 #include "base/win/windows_version.h"
 #include "build/build_config.h"
@@ skipping 54 matching lines @@
   SetTextSubpixelRenderingEnabled(false);
   SetHorizontalAlignment(gfx::ALIGN_CENTER);
 
   // The largest text height that fits in the button. If the font list height
   // is larger than this, it will be shrunk to match it.
   // TODO(noms): Calculate this constant algorithmically from the button's size.
   const int kDisplayFontHeight = 16;
   SetFontList(GetFontList().DeriveWithHeightUpperBound(kDisplayFontHeight));
 
   ui::ResourceBundle* rb = &ui::ResourceBundle::GetSharedInstance();
-  if (button_style == THEMED_BUTTON) {
+  if (button_style == AvatarButtonStyle::THEMED) {
     const int kNormalImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_NORMAL);
     const int kHotImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_HOVER);
     const int kPushedImageSet[] = IMAGE_GRID(IDR_AVATAR_THEMED_BUTTON_PRESSED);
 
     SetBorder(CreateBorder(kNormalImageSet, kHotImageSet, kPushedImageSet));
     generic_avatar_ =
         *rb->GetImageNamed(IDR_AVATAR_THEMED_BUTTON_AVATAR).ToImageSkia();
 #if defined(OS_WIN)
   } else if (base::win::GetVersion() >= base::win::VERSION_WIN8 ||
              browser->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH) {
@@ skipping 133 matching lines @@
     SetImage(views::Button::STATE_NORMAL, gfx::ImageSkia());
   }
 
   // If we are not using the generic button, then reset the spacing between
   // the text and the possible authentication error icon.
   const int kDefaultImageTextSpacing = 5;
   SetImageLabelSpacing(use_generic_button ? 0 : kDefaultImageTextSpacing);
 
   PreferredSizeChanged();
 }