Update avatar button to MD (part 1)

chrome/browser/ui/views/frame/avatar_button_manager.cc

Index: chrome/browser/ui/views/frame/avatar_button_manager.cc
diff --git a/chrome/browser/ui/views/frame/avatar_button_manager.cc b/chrome/browser/ui/views/frame/avatar_button_manager.cc
index 8101bf8b0e16bf11027d8b71cb84f1e4d0e38a71..1d24c4e310649b27278e33dad85a2fdf5bbded18 100644
--- a/chrome/browser/ui/views/frame/avatar_button_manager.cc
+++ b/chrome/browser/ui/views/frame/avatar_button_manager.cc
@@ -6,13 +6,22 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/themes/theme_service.h"
+#include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "chrome/browser/ui/views/profiles/new_avatar_button.h"
+#include "chrome/browser/ui/views/profiles/avatar_button.h"
+#include "chrome/browser/ui/views/profiles/profile_chooser_view.h"
+#include "chrome/browser/ui/views/profiles/themed_avatar_button.h"
+#include "chrome/browser/ui/views/profiles/win10_native_avatar_button.h"

[Evan Stade, 2017/04/28 18:38:29]

nit: only include on windows.

[emx, 2017/05/02 15:17:11]

Done.

+
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
 
 AvatarButtonManager::AvatarButtonManager(BrowserNonClientFrameView* frame_view)
-    : frame_view_(frame_view), view_(nullptr) {}
+    : frame_view_(frame_view), button_(nullptr) {}
 
 void AvatarButtonManager::Update(AvatarButtonStyle style) {
   BrowserView* browser_view = frame_view_->browser_view();
@@ -30,39 +39,41 @@ void AvatarButtonManager::Update(AvatarButtonStyle style) {
            .GetProfileAttributesWithPath(profile->GetPath(), &unused)) ||
       // Desktop guest shows the avatar button.
       browser_view->IsIncognito()) {
-    if (!view_) {
-      view_ = new NewAvatarButton(this, style, profile);
-      view_->set_id(VIEW_ID_AVATAR_BUTTON);
-      frame_view_->AddChildView(view_);
+    if (!button_) {
+#if defined(OS_WIN)
+      // TODO: use MD button in other cases, too [http://crbug.com/591586]
+      if ((base::win::GetVersion() >= base::win::VERSION_WIN10) &&
+          ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
+        DCHECK_EQ(AvatarButtonStyle::NATIVE, style);
+        button_ = new Win10NativeAvatarButton(this, profile, browser_view);
+      } else {
+        button_ = new ThemedAvatarButton(this, style, profile);
+      }
+#else
+      button_ = new ThemedAvatarButton(this, style, profile);
+#endif  // defined(OS_WIN)
+
+      button_->set_id(VIEW_ID_AVATAR_BUTTON);
+      frame_view_->AddChildView(button_);
       frame->GetRootView()->Layout();
     }
-  } else if (view_) {
-    delete view_;
-    view_ = nullptr;
+  } else if (button_) {
+    delete button_;
+    button_ = nullptr;
     frame->GetRootView()->Layout();
   }
 }
 
-void AvatarButtonManager::ButtonPreferredSizeChanged() {
-  // Perform a re-layout if the avatar button has changed, since that can affect
-  // the size of the tabs.
-  if (!view_ || !frame_view_->browser_view()->initialized())
-    return;  // Ignore the update during view creation.
-
-  frame_view_->InvalidateLayout();
-  frame_view_->frame()->GetRootView()->Layout();
-}
-
-void AvatarButtonManager::ButtonPressed(views::Button* sender,
-                                       const ui::Event& event) {
-  DCHECK_EQ(view_, sender);
+void AvatarButtonManager::OnMenuButtonClicked(views::MenuButton* source,
+                                              const gfx::Point& point,
+                                              const ui::Event* event) {
+  DCHECK_EQ(button_, source);
   BrowserWindow::AvatarBubbleMode mode =
       BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT;
-  if ((event.IsMouseEvent() &&
-       static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) ||
-      (event.type() == ui::ET_GESTURE_LONG_PRESS)) {
+
+  if (event && event->type() == ui::ET_GESTURE_LONG_PRESS)
     return;
-  }
+
   frame_view_->browser_view()->ShowAvatarBubbleFromAvatarButton(
       mode, signin::ManageAccountsParams(),
       signin_metrics::AccessPoint::ACCESS_POINT_AVATAR_BUBBLE_SIGN_IN, false);