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 295 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);
+  int profile_card_height = EditableProfilePhoto::icon_image_side() +
+                            2 *
+                                (EditableProfilePhoto::badge_spacing() +
+                                 views::kRelatedControlSmallVerticalSpacing);
+  grid_layout->StartRow(
+      0, 0,
+      avatar_item.signed_in ? (profile_card_height / 2) : profile_card_height);

[jlebel, 2017/02/23 13:38:23]

I don't know why there is a format change here.
git cl format really wants to be that way.

Do you want me to keep it that way, or should I revert this part and go against
the default format?

[Peter Kasting, 2017/02/24 00:48:40]

git cl format's formatting here is fine, IMO slightly better.

   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 or account consistency is
+  // enabled. It contains 2 rows if signed in and account consistency is
+  // disabled (the second row is for the email label). For the second case the
+  // profile photo has to be over 2 rows.
+  int row_span =
+      (avatar_item.signed_in && !switches::IsEnableAccountConsistency()) ? 2
+                                                                         : 1;
+  grid_layout->AddView(current_profile_photo, 1, row_span);
+  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;
   }
 
@@ skipping 12 matching lines @@
       manage_accounts_button_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
       manage_accounts_button_->SetMinSize(
           gfx::Size(GetFixedMenuWidth(), kButtonHeight));
       view->AddChildView(manage_accounts_button_);
     } 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;
 }