Linux/Windows: Adding tooltip in profile switcher menu.

chrome/browser/ui/views/profiles/profile_chooser_view.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/profile_chooser_view.h"
 
 #include "base/macros.h"
 #include "base/metrics/user_metrics.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 75 matching lines @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Helpers --------------------------------------------------------------------
 
 const int kButtonHeight = 32;
+const int kCurrentProfileMenuItemHeight = 56;
 const int kPasswordCombinedFixedGaiaViewWidth = 360;
 const int kFixedGaiaViewWidth = 448;
 const int kFixedAccountRemovalViewWidth = 280;
 const int kFixedSwitchUserViewWidth = 320;
 const int kLargeImageSide = 88;
 const int kMdImageSide = 40;
 
 // Spacing between the edge of the material design user menu and the
 // top/bottom or left/right of the menu items.
 const int kMaterialMenuEdgeMargin = 16;
@@ skipping 200 matching lines @@
  public:
   explicit SizedContainer(const gfx::Size& preferred_size)
       : preferred_size_(preferred_size) {}
 
   gfx::Size GetPreferredSize() const override { return preferred_size_; }
 
  private:
   gfx::Size preferred_size_;
 };
 
-// NonInteractiveContainer -------------------------------------------------
-
-// A simple container view that does not process events within subtree.
-class NonInteractiveContainer : public views::View {
- public:
-  NonInteractiveContainer() {}
-
-  // views::CanProcessEventsWithinSubtree:
-  bool CanProcessEventsWithinSubtree() const override { return false; }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(NonInteractiveContainer);
-};
-
 // A view to host the GAIA webview overlapped with a back button.  This class
 // is needed to reparent the back button inside a native view so that on
 // windows, user input can be be properly routed to the button.
 class HostView : public views::View {
  public:
   HostView() {}
 
  private:
   // views::View:
   void ViewHierarchyChanged(
@@ skipping 1399 matching lines @@
     const AvatarMenu::Item& avatar_item,
     bool is_guest) {
   views::View* view = new views::View();
   view->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0,
                            views::kRelatedControlVerticalSpacing, 0));
 
   // Container for the profile photo and avatar/user name.
   BackgroundColorHoverButton* current_profile_card =
       new BackgroundColorHoverButton(this, base::string16());
+  views::GridLayout* grid_layout = new views::GridLayout(current_profile_card);
+  current_profile_card->SetLayoutManager(grid_layout);
+  views::ColumnSet* columns = grid_layout->AddColumnSet(0);
+  columns->AddPaddingColumn(0, kMaterialMenuEdgeMargin);
+  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 0,
+                     views::GridLayout::USE_PREF, 0, 0);
+  columns->AddPaddingColumn(
+      0, kMaterialMenuEdgeMargin - EditableProfilePhoto::badge_spacing());
+  columns->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
+                     views::GridLayout::USE_PREF, 0, 0);
+  columns->AddPaddingColumn(0, kMaterialMenuEdgeMargin);
+  grid_layout->AddPaddingRow(0, 0);
+  grid_layout->StartRow(0, 0, avatar_item.signed_in
+                                  ? (kCurrentProfileMenuItemHeight / 2)

[msarda, 2017/02/20 17:01:46]

Do you need this new "magic" constant kCurrentProfileMenuItemHeight (why is it
58 and not another value)? Maybe this value can be computed dynamically based on
the height of the photo.

[msarda, 2017/02/20 17:01:46]

Should you divide by 2 if there is a single line?

[jlebel, 2017/02/21 08:28:16]

If I don't set the height as half of the total height, the first line takes its
preferred height (so about 20 pixels), and the second line takes the rest.

[jlebel, 2017/02/21 08:28:16]

Done.

+                                  : kCurrentProfileMenuItemHeight);
   current_profile_card_ = current_profile_card;
 
   // Profile picture, left-aligned.
   EditableProfilePhoto* current_profile_photo = new EditableProfilePhoto(
       this, avatar_item.icon, !is_guest, browser_->profile());
 
   // Profile name, left-aligned to the right of profile icon.
   views::Label* current_profile_name = new views::Label(
       profiles::GetAvatarNameForProfile(browser_->profile()->GetPath()));
   current_profile_card->set_title(current_profile_name);
   current_profile_name->SetFontList(
       ui::ResourceBundle::GetSharedInstance().GetFontListWithDelta(
           1, gfx::Font::FontStyle::NORMAL, gfx::Font::Weight::MEDIUM));
   current_profile_name->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-  NonInteractiveContainer* profile_name_container =
-      new NonInteractiveContainer();
-  int name_container_v_spacing =
-      (current_profile_photo->GetPreferredSize().height() -
-       current_profile_name->GetPreferredSize().height()) / 2;
-  views::BoxLayout* profile_name_layout = new views::BoxLayout(
-      views::BoxLayout::kVertical, 0, name_container_v_spacing, 0);
-  profile_name_container->SetLayoutManager(profile_name_layout);
-  profile_name_container->AddChildView(current_profile_name);
 
-  const int between_child_spacing =
-      kMaterialMenuEdgeMargin - EditableProfilePhoto::badge_spacing();
-  current_profile_card_->SetLayoutManager(new views::BoxLayout(
-      views::BoxLayout::kHorizontal, 0,
-      views::kRelatedControlSmallVerticalSpacing, between_child_spacing));
-  current_profile_card_->AddChildView(current_profile_photo);
-  current_profile_card_->AddChildView(profile_name_container);
+  // The grid layout contains one row if not signed in, and 2 if signed in (the
+  // second row is for the email created later). Therefore, the profile photo is
+  // over 2 rows if signed in.
+  grid_layout->AddView(current_profile_photo, 1, avatar_item.signed_in ? 2 : 1);
+  grid_layout->AddView(current_profile_name, 1, 1, views::GridLayout::LEADING,
+                       avatar_item.signed_in ? views::GridLayout::TRAILING
+                                             : views::GridLayout::CENTER);
   current_profile_card_->SetMinSize(gfx::Size(
       GetFixedMenuWidth(), current_profile_photo->GetPreferredSize().height() +
                                2 * views::kRelatedControlSmallVerticalSpacing));
   view->AddChildView(current_profile_card_);
 
   if (is_guest) {
     current_profile_card_->SetEnabled(false);
     return view;
   }
 
   const base::string16 profile_name =
       profiles::GetAvatarNameForProfile(browser_->profile()->GetPath());
 
   // The available links depend on the type of profile that is active.
   if (avatar_item.signed_in) {
     if (switches::IsEnableAccountConsistency()) {
       base::string16 button_text = l10n_util::GetStringUTF16(
           IsProfileChooser(view_mode_)
               ? IDS_PROFILES_PROFILE_MANAGE_ACCOUNTS_BUTTON
               : IDS_PROFILES_PROFILE_HIDE_MANAGE_ACCOUNTS_BUTTON);
       manage_accounts_button_ =
           new BackgroundColorHoverButton(this, button_text);
       manage_accounts_button_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       manage_accounts_button_->SetMinSize(
           gfx::Size(GetFixedMenuWidth(), kButtonHeight));
       view->AddChildView(manage_accounts_button_);

[msarda, 2017/02/20 17:01:46]

I think the view will not be properly displayed in this case as it looks like a
second label is not displayed in this case. To testing it, go to chrome://flags
and enable "account consistency".

[jlebel, 2017/02/21 08:28:16]

Done.

     } else {
       views::Label* email_label = new views::Label(avatar_item.username);
       current_profile_card->set_subtitle(email_label);
       email_label->SetElideBehavior(gfx::ELIDE_EMAIL);
       email_label->SetEnabled(false);
       email_label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
-      name_container_v_spacing =
-          (current_profile_photo->GetPreferredSize().height() -
-           current_profile_name->GetPreferredSize().height() -
-           email_label->GetPreferredSize().height()) / 2;
-      profile_name_layout->set_inside_border_insets(
-          gfx::Insets(name_container_v_spacing, 0));
-      profile_name_container->AddChildView(email_label);
+      grid_layout->StartRow(1, 0);
+      // Skip first column for the profile icon.
+      grid_layout->SkipColumns(1);
+      grid_layout->AddView(email_label, 1, 1, views::GridLayout::LEADING,
+                           views::GridLayout::LEADING);
     }
 
     current_profile_card_->SetAccessibleName(
         l10n_util::GetStringFUTF16(
             IDS_PROFILES_EDIT_SIGNED_IN_PROFILE_ACCESSIBLE_NAME,
             profile_name,
             avatar_item.username));
     return view;
   }
 
@@ skipping 551 matching lines @@
       IncognitoModePrefs::GetAvailability(browser_->profile()->GetPrefs()) !=
           IncognitoModePrefs::DISABLED;
   return incognito_available && !browser_->profile()->IsGuestSession();
 }
 
 void ProfileChooserView::PostActionPerformed(
     ProfileMetrics::ProfileDesktopMenu action_performed) {
   ProfileMetrics::LogProfileDesktopMenu(action_performed, gaia_service_type_);
   gaia_service_type_ = signin::GAIA_SERVICE_TYPE_NONE;
 }