Simplify some old avatar menu button code.

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

Index: chrome/browser/ui/views/profiles/avatar_menu_button.cc
diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button.cc b/chrome/browser/ui/views/profiles/avatar_menu_button.cc
deleted file mode 100644
index a11f8b55896e8fac6abd7af80aa5cc4509387555..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/profiles/avatar_menu_button.cc
+++ /dev/null
@@ -1,159 +0,0 @@
-// 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/avatar_menu_button.h"
-
-#include <stddef.h>
-
-#include "base/command_line.h"
-#include "build/build_config.h"
-#include "chrome/browser/browser_process.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/profiles/avatar_menu.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_attributes_entry.h"
-#include "chrome/browser/profiles/profile_attributes_storage.h"
-#include "chrome/browser/profiles/profile_avatar_icon_util.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/profiles/profile_metrics.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_commands.h"
-#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
-#include "components/prefs/pref_service.h"
-#include "components/signin/core/common/profile_management_switches.h"
-#include "content/public/browser/notification_service.h"
-#include "grit/theme_resources.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/gfx/canvas.h"
-#include "ui/views/view_targeter.h"
-#include "ui/views/widget/widget.h"
-
-static inline int Round(double x) {
-  return static_cast<int>(x + 0.5);
-}
-
-// static
-const char AvatarMenuButton::kViewClassName[] = "AvatarMenuButton";
-
-AvatarMenuButton::AvatarMenuButton(BrowserView* browser_view)
-    : MenuButton(base::string16(), this, false),
-      browser_view_(browser_view),
-      enabled_(browser_view_->IsRegularOrGuestSession()),
-      is_rectangle_(false),
-      old_height_(0) {
-  // In RTL mode, the avatar icon should be looking the opposite direction.
-  EnableCanvasFlippingForRTLUI(true);
-
-  SetEventTargeter(
-      std::unique_ptr<views::ViewTargeter>(new views::ViewTargeter(this)));
-}
-
-AvatarMenuButton::~AvatarMenuButton() {
-}
-
-const char* AvatarMenuButton::GetClassName() const {
-  return kViewClassName;
-}
-
-void AvatarMenuButton::OnPaint(gfx::Canvas* canvas) {
-  if (!icon_.get())
-    return;
-
-  if (old_height_ != height() || button_icon_.isNull()) {
-    old_height_ = height();
-    button_icon_ = *profiles::GetAvatarIconForTitleBar(
-        *icon_, is_rectangle_, width(), height()).ToImageSkia();
-  }
-
-  // Scale the image to fit the width of the button.
-  int dst_width = std::min(button_icon_.width(), width());
-  // Truncate rather than rounding, so that for odd widths we put the extra
-  // pixel on the left.
-  int dst_x = (width() - dst_width) / 2;
-
-  // Scale the height and maintain aspect ratio. This means that the
-  // icon may not fit in the view. That's ok, we just vertically center it.
-  float scale =
-      static_cast<float>(dst_width) / static_cast<float>(button_icon_.width());
-  // Round here so that we minimize the aspect ratio drift.
-  int dst_height = Round(button_icon_.height() * scale);
-  // Round rather than truncating, so that for odd heights we select an extra
-  // pixel below the image center rather than above.  This is because the
-  // incognito image has shadows at the top that make the apparent center below
-  // the real center.
-  int dst_y = Round((height() - dst_height) / 2.0);
-  canvas->DrawImageInt(button_icon_, 0, 0, button_icon_.width(),
-      button_icon_.height(), dst_x, dst_y, dst_width, dst_height, false);
-}
-
-void AvatarMenuButton::SetAvatarIcon(const gfx::Image& icon,
-                                     bool is_rectangle) {
-  icon_.reset(new gfx::Image(icon));
-  button_icon_ = gfx::ImageSkia();
-  is_rectangle_ = is_rectangle;
-  SchedulePaint();
-}
-
-// static
-bool AvatarMenuButton::GetAvatarImages(
-    const BrowserNonClientFrameView* frame_view,
-    bool should_show_avatar_menu,
-    gfx::Image* avatar,
-    gfx::Image* taskbar_badge_avatar,
-    bool* is_rectangle) {
-  const Profile* profile = frame_view->browser_view()->browser()->profile();
-  if (profile->GetProfileType() == Profile::GUEST_PROFILE) {
-    *avatar = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
-        profiles::GetPlaceholderAvatarIconResourceID());
-  } else if (profile->GetProfileType() == Profile::INCOGNITO_PROFILE) {
-    *avatar = gfx::Image(frame_view->GetOTRAvatarIcon());
-    // TODO(nkostylev): Allow this on ChromeOS once the ChromeOS test
-    // environment handles profile directories correctly.
-#if !defined(OS_CHROMEOS)
-    bool is_badge_rectangle = false;
-    // The taskbar badge should be the profile avatar, not the OTR avatar.
-    AvatarMenu::GetImageForMenuButton(profile->GetPath(),
-                                      taskbar_badge_avatar,
-                                      &is_badge_rectangle);
-#endif
-  } else if (should_show_avatar_menu) {
-    ProfileAttributesEntry* entry;
-    if (!g_browser_process->profile_manager()->GetProfileAttributesStorage().
-        GetProfileAttributesWithPath(profile->GetPath(), &entry))
-      return false;
-
-#if defined(OS_CHROMEOS)
-    AvatarMenu::GetImageForMenuButton(profile->GetPath(), avatar, is_rectangle);
-#else
-    *avatar = entry->GetAvatarIcon();
-    // TODO(noms): Once the code for the old avatar menu button is removed,
-    // this function will only be called for badging the taskbar icon.  The
-    // function can be renamed to something like GetAvatarImageForBadging()
-    // and only needs to return the avatar from
-    // AvatarMenu::GetImageForMenuButton().
-    bool is_badge_rectangle = false;
-    AvatarMenu::GetImageForMenuButton(profile->GetPath(),
-                                      taskbar_badge_avatar,
-                                      &is_badge_rectangle);
-#endif
-  }
-  return true;
-}
-
-// views::ViewTargeterDelegate:
-bool AvatarMenuButton::DoesIntersectRect(const views::View* target,
-                                         const gfx::Rect& rect) const {
-  CHECK_EQ(target, this);
-  return enabled_ &&
-         views::ViewTargeterDelegate::DoesIntersectRect(target, rect);
-}
-
-// views::MenuButtonListener implementation
-void AvatarMenuButton::OnMenuButtonClicked(views::MenuButton* source,
-                                           const gfx::Point& point,
-                                           const ui::Event* event) {
-  if (enabled_)
-    chrome::ShowAvatarMenu(browser_view_->browser());
-}