Reflow of the profile items in desktop user menu

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 <stddef.h>
 
 #include <map>
@@ skipping 48 matching lines @@
   // the existing bubble will auto-close due to focus loss.
   static void ShowBubble(
       profiles::BubbleViewMode view_mode,
       profiles::TutorialMode tutorial_mode,
       const signin::ManageAccountsParams& manage_accounts_params,
       signin_metrics::AccessPoint access_point,
       views::View* anchor_view,
       Browser* browser);
   static bool IsShowing();
   static void Hide();
+  static int GetFixedMenuWidth();

[Evan Stade, 2016/06/30 14:36:45]

this doesn't need to be public. I'd just make it a file-local static in the .cc
(in the anonymous namespace)

[Jane, 2016/06/30 14:47:34]

Done.

 
  private:
   friend class ProfileChooserViewExtensionsTest;
 
   typedef std::vector<size_t> Indexes;
   typedef std::map<views::Button*, int> ButtonIndexes;
   typedef std::map<views::Button*, std::string> AccountButtonIndexes;
 
   ProfileChooserView(views::View* anchor_view,
                      Browser* browser,
@@ skipping 62 matching lines @@
   // bubble, options buttons, tutorials).
   void PopulateCompleteProfileChooserView(views::GridLayout* layout,
                                           AvatarMenu* avatar_menu);
 
   // Creates the main profile card for the profile |avatar_item|. |is_guest|
   // 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* CreateMaterialDesignCurrentProfileView(
+      const AvatarMenu::Item& avatar_item,
+      bool is_guest);
   views::View* CreateGuestProfileView();
   views::View* CreateOtherProfilesView(const Indexes& avatars_to_show);
   views::View* CreateOptionsView(bool display_lock, AvatarMenu* avatar_menu);
   views::View* CreateSupervisedUserDisclaimerView();
 
   // Account Management view for the profile |avatar_item|.
   views::View* CreateCurrentProfileAccountsView(
       const AvatarMenu::Item& avatar_item);
   void CreateAccountButton(views::GridLayout* layout,
                            const std::string& account_id,
@@ skipping 69 matching lines @@
   // Links and buttons displayed in the tutorial card.
   views::LabelButton* tutorial_sync_settings_ok_button_;
   views::Link* tutorial_sync_settings_link_;
   views::LabelButton* tutorial_see_whats_new_button_;
   views::Link* tutorial_not_you_link_;
   views::Link* tutorial_learn_more_link_;
   views::ImageButton* tutorial_close_button_;
 
   // Links and buttons displayed in the active profile card.
   views::Link* manage_accounts_link_;
-  views::LabelButton* signin_current_profile_link_;
+  views::LabelButton* signin_current_profile_button_;
   views::LabelButton* auth_error_email_button_;
 
   // 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* guest_profile_button_;
   views::LabelButton* users_button_;
@@ skipping 26 matching lines @@
   // The GAIA service type provided in the response header.
   signin::GAIAServiceType gaia_service_type_;
 
   // The current access point of sign in.
   const signin_metrics::AccessPoint access_point_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileChooserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_PROFILES_PROFILE_CHOOSER_VIEW_H_