[Win] Redesign the avatar bubble UI

chrome/browser/ui/views/profiles/profile_chooser_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_
 
 #include <map>
 #include <vector>
 
 #include "chrome/browser/profiles/avatar_menu.h"
 #include "chrome/browser/profiles/avatar_menu_observer.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "google_apis/gaia/oauth2_token_service.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/styled_label_listener.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 
 class EditableProfilePhoto;
 class EditableProfileName;
 
 namespace gfx {
 class Image;
 }
 
 namespace views {
 class GridLayout;
 class ImageButton;
 class Link;
 class LabelButton;
 }
 
 class Browser;
 
 // This bubble view is displayed when the user clicks on the avatar button.
 // It displays a list of profiles and allows users to switch between profiles.
 class ProfileChooserView : public views::BubbleDelegateView,
                            public views::ButtonListener,
                            public views::LinkListener,
-                           public views::MenuButtonListener,
                            public views::StyledLabelListener,
                            public views::TextfieldController,
                            public AvatarMenuObserver,
                            public OAuth2TokenService::Observer {
  public:
   // Different views that can be displayed in the bubble.
   enum BubbleViewMode {
     // Shows a "fast profile switcher" view.
     BUBBLE_VIEW_MODE_PROFILE_CHOOSER,
     // Shows a list of accounts for the active user.
@@ skipping 26 matching lines @@
   static void clear_close_on_deactivate_for_testing() {
     close_on_deactivate_for_testing_ = false;
   }
 
  private:
   friend class NewAvatarMenuButtonTest;
   FRIEND_TEST_ALL_PREFIXES(NewAvatarMenuButtonTest, SignOut);
 
   typedef std::vector<size_t> Indexes;
   typedef std::map<views::Button*, int> ButtonIndexes;
-  typedef std::map<views::View*, std::string> AccountButtonIndexes;
+  typedef std::map<views::Button*, std::string> AccountButtonIndexes;
 
   ProfileChooserView(views::View* anchor_view,
                      views::BubbleBorder::Arrow arrow,
                      const gfx::Rect& anchor_rect,
                      Browser* browser,
                      BubbleViewMode view_mode);
   virtual ~ProfileChooserView();
 
   // views::BubbleDelegateView:
   virtual void Init() OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
 
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
   // views::LinkListener:
   virtual void LinkClicked(views::Link* sender, int event_flags) OVERRIDE;
 
-  // views::MenuButtonListener:
-  virtual void OnMenuButtonClicked(views::View* source,
-                                   const gfx::Point& point) OVERRIDE;
-
   // views::StyledLabelListener implementation.
   virtual void StyledLabelLinkClicked(
       const gfx::Range& range, int event_flags) OVERRIDE;
 
   // views::TextfieldController:
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE;
 
   // AvatarMenuObserver:
   virtual void OnAvatarMenuChanged(AvatarMenu* avatar_menu) OVERRIDE;
@@ skipping 20 matching lines @@
   // is used to determine whether to show any Sign in/Sign out/Manage accounts
   // links.
   views::View* CreateCurrentProfileView(
       const AvatarMenu::Item& avatar_item,
       bool is_guest);
   views::View* CreateGuestProfileView();
   views::View* CreateOtherProfilesView(const Indexes& avatars_to_show);
   views::View* CreateOptionsView(bool enable_lock);
 
   // Account Management view for the profile |avatar_item|.
-  views::View* CreateCurrentProfileEditableView(
-      const AvatarMenu::Item& avatar_item);
   views::View* CreateCurrentProfileAccountsView(
       const AvatarMenu::Item& avatar_item);
   void CreateAccountButton(views::GridLayout* layout,
                            const std::string& account,
                            bool is_primary_account,
                            int width);
 
   // Creates a webview showing the gaia signin page.
   views::View* CreateGaiaSigninView(bool add_secondary_account);
 
@@ skipping 36 matching lines @@
   // Accounts associated with the current profile.
   AccountButtonIndexes current_profile_accounts_map_;
 
   // Links and buttons displayed in the tutorial card.
   views::Link* tutorial_learn_more_link_;
   views::LabelButton* tutorial_ok_button_;
   views::LabelButton* tutorial_enable_new_profile_management_button_;
 
   // Links displayed in the active profile card.
   views::Link* manage_accounts_link_;
-  views::Link* signin_current_profile_link_;
+  views::LabelButton* signin_current_profile_link_;
 
   // The profile name and photo in the active profile card. Owned by the
   // views hierarchy.
   EditableProfilePhoto* current_profile_photo_;
   EditableProfileName* current_profile_name_;
 
   // Action buttons.
   views::LabelButton* users_button_;
   views::LabelButton* lock_button_;
-  views::LabelButton* add_account_button_;
+  views::Link* add_account_link_;
 
   // Buttons displayed in the gaia signin view.
   views::ImageButton* gaia_signin_cancel_button_;
 
   // Links and buttons displayed in the account removal view.
   views::LabelButton* remove_account_and_relaunch_button_;
   views::ImageButton* account_removal_cancel_button_;
 
   // Records the account id to remove.
   std::string account_id_to_remove_;
 
   // Active view mode.
   BubbleViewMode view_mode_;
 
   // Whether the tutorial is currently shown.
   bool tutorial_showing_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_