Update chromeos system menu buttons for MD.

ash/common/system/user/user_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 "ash/common/system/user/user_view.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/multi_profile_uma.h"
 #include "ash/common/popup_message.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
 #include "ash/common/system/tray/tray_popup_label_button_border.h"
+#include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/user/button_from_view.h"
 #include "ash/common/system/user/login_status.h"
 #include "ash/common/system/user/rounded_image_view.h"
 #include "ash/common/system/user/user_card_view.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_root_window_controller.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_info.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/paint_vector_icon.h"
+#include "ui/views/controls/button/label_button.h"
+#include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace tray {
 
 namespace {
 
+bool UseMd() {
+  return MaterialDesignController::IsSystemTrayMenuMaterial();
+}
+
 const int kPublicAccountLogoutButtonBorderImagesNormal[] = {
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
     IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
     IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
     IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER,
     IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
     IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND,
@@ skipping 104 matching lines @@
 
   add_user_ = new views::View;
   add_user_->SetBorder(
       views::Border::CreateEmptyBorder(0, kTrayUserTileHoverBorderInset, 0, 0));
 
   add_user_->SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kTrayPopupPaddingBetweenItems));
   AddChildViewAt(add_user_, 0);
 
   // Add the icon which is also the anchor for messages.
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+  if (UseMd()) {
     views::ImageView* icon = new views::ImageView();
     icon->SetImage(
         gfx::CreateVectorIcon(kSystemMenuNewUserIcon, kMenuIconColor));
     icon->SetBorder(views::Border::CreateEmptyBorder(
         gfx::Insets((kTrayItemSize - icon->GetPreferredSize().width()) / 2)));
     anchor_ = icon;
     add_user_->AddChildView(icon);
   } else {
     RoundedImageView* icon =
         new RoundedImageView(kTrayRoundedBorderRadius, true);
@@ skipping 29 matching lines @@
     set_background(views::Background::CreateSolidBackground(
         login == LoginStatus::PUBLIC ? kPublicAccountBackgroundColor
                                      : kBackgroundColor));
   }
   // The logout button must be added before the user card so that the user card
   // can correctly calculate the remaining available width.
   // Note that only the current multiprofile user gets a button.
   if (!user_index_)
     AddLogoutButton(login);
   AddUserCard(login);
+
+  if (UseMd()) {
+    auto* layout = new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
+                                        kTrayPopupPaddingBetweenItems);
+    // Only the active user panel will be forced to a certain height.
+    if (!user_index_) {
+      layout->set_minimum_cross_axis_size(
+          GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT));
+    }
+    layout->SetFlexForView(user_card_view_, 1);
+    SetLayoutManager(layout);
+  }
 }
 
 UserView::~UserView() {
   RemoveAddUserMenuOption();
 }
 
 void UserView::MouseMovedOutOfHost() {
   RemoveAddUserMenuOption();
 }
 
 TrayUser::TestState UserView::GetStateForTest() const {
   if (add_menu_option_.get()) {
     return add_user_enabled_ ? TrayUser::ACTIVE : TrayUser::ACTIVE_BUT_DISABLED;
   }
 
   if (!is_user_card_button_)
     return TrayUser::SHOWN;
 
   return static_cast<ButtonFromView*>(user_card_view_)->is_hovered_for_test()
              ? TrayUser::HOVERED
              : TrayUser::SHOWN;
 }
 
 gfx::Rect UserView::GetBoundsInScreenOfUserButtonForTest() {
   DCHECK(user_card_view_);
   return user_card_view_->GetBoundsInScreen();
 }
 
 gfx::Size UserView::GetPreferredSize() const {
+  // MD uses a layout manager.
+  if (UseMd())
+    return View::GetPreferredSize();
+
   // The width is more or less ignored (set by other rows in the system menu).
-  gfx::Size size;
-  if (user_card_view_)
-    size = user_card_view_->GetPreferredSize();
+  gfx::Size size = user_card_view_->GetPreferredSize();
   if (logout_button_)
     size.SetToMax(logout_button_->GetPreferredSize());
   // Only the active user panel will be forced to a certain height.
   if (!user_index_) {
     size.set_height(std::max(
         size.height(),
         GetTrayConstant(TRAY_POPUP_ITEM_HEIGHT) + GetInsets().height()));
   }
   return size;
 }
 
 int UserView::GetHeightForWidth(int width) const {
   return GetPreferredSize().height();
 }
 
 void UserView::Layout() {

[tdanderson, 2016/11/01 22:38:50]

With the way you've changed the logic here, I assume you're 100% certain that
|user_card_view_| will be non-null at the top of Layout()? If so, consider
adding a DCHECK to assert that.

[Evan Stade, 2016/11/01 23:54:09]

AddUserCard is called in the constructor and it always creates user_card_view_.
Thus it should be non-null in pretty much every function, not just this one. The
code here unconditionally derefs user_card_view_ so in terms of documentation, I
think the DCHECK doesn't add much.

+  // MD uses a layout manager.
+  if (UseMd())
+    return views::View::Layout();
+
   gfx::Rect contents_area(GetContentsBounds());
-  if (user_card_view_ && logout_button_) {
+  if (logout_button_) {
     // Give the logout button the space it requests.
     gfx::Rect logout_area = contents_area;
     logout_area.ClampToCenteredSize(logout_button_->GetPreferredSize());
     logout_area.set_x(contents_area.right() - logout_area.width());
 
     // Give the remaining space to the user card.
     gfx::Rect user_card_area = contents_area;
     int remaining_width = contents_area.width() - logout_area.width();
     if (IsMultiProfileSupportedAndUserActive()) {
       // In multiprofile case |user_card_view_| and |logout_button_| have to
@@ skipping 15 matching lines @@
       logout_area.set_width(logout_area.width() +
                             kTrayUserTileHoverBorderInset);
     } else {
       // In all other modes we have to make sure that there is enough spacing
       // between the two.
       remaining_width -= kTrayPopupPaddingBetweenItems;
     }
     user_card_area.set_width(remaining_width);
     user_card_view_->SetBoundsRect(user_card_area);
     logout_button_->SetBoundsRect(logout_area);
-  } else if (user_card_view_) {
+  } else {
     user_card_view_->SetBoundsRect(contents_area);
-  } else if (logout_button_) {
-    logout_button_->SetBoundsRect(contents_area);
   }
 }
 
 void UserView::ButtonPressed(views::Button* sender, const ui::Event& event) {
   if (sender == logout_button_) {
     WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_SIGN_OUT);
     RemoveAddUserMenuOption();
     WmShell::Get()->system_tray_delegate()->SignOut();
   } else if (sender == user_card_view_ &&
              IsMultiProfileSupportedAndUserActive()) {
@@ skipping 23 matching lines @@
     RemoveAddUserMenuOption();
 }
 
 void UserView::OnDidChangeFocus(View* focused_before, View* focused_now) {
   // Nothing to do here.
 }
 
 void UserView::AddLogoutButton(LoginStatus login) {
   const base::string16 title =
       user::GetLocalizedSignOutStringForStatus(login, true);
-  auto* logout_button = new TrayPopupLabelButton(this, title);
+  auto* logout_button = CreateTrayPopupBorderlessButton(this, title);
   logout_button->SetAccessibleName(title);
   logout_button_ = logout_button;
   // In public account mode, the logout button border has a custom color.
   if (login == LoginStatus::PUBLIC) {
     std::unique_ptr<TrayPopupLabelButtonBorder> border(
         new TrayPopupLabelButtonBorder());
     border->SetPainter(false, views::Button::STATE_NORMAL,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesNormal));
     border->SetPainter(false, views::Button::STATE_HOVERED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
     border->SetPainter(false, views::Button::STATE_PRESSED,
                        views::Painter::CreateImageGridPainter(
                            kPublicAccountLogoutButtonBorderImagesHovered));
     logout_button_->SetBorder(std::move(border));
   }
   AddChildView(logout_button_);
 }
 
 void UserView::AddUserCard(LoginStatus login) {
   // Add padding around the panel.
   // TODO(estade): share this constant?
-  const int kSidePadding = MaterialDesignController::IsSystemTrayMenuMaterial()
-                               ? 12
-                               : kTrayPopupPaddingHorizontal;
+  const int kSidePadding = UseMd() ? 12 : kTrayPopupPaddingHorizontal;
   SetBorder(views::Border::CreateEmptyBorder(
       kTrayPopupUserCardVerticalPadding, kSidePadding,
       kTrayPopupUserCardVerticalPadding, kSidePadding));
 
   views::TrayBubbleView* bubble_view =
       owner_->system_tray()->GetSystemBubble()->bubble_view();
   int max_card_width = bubble_view->GetMaximumSize().width() -
                        (2 * kSidePadding + kTrayPopupPaddingBetweenItems);
   if (logout_button_)
     max_card_width -= logout_button_->GetPreferredSize().width();
@@ skipping 17 matching lines @@
     views::View* contents_view = user_card_view_;
     if (user_index_) {
       // Since the activation border needs to be drawn around the tile, we
       // have to put the tile into another view which fills the menu panel,
       // but keeping the offsets of the content.
       contents_view = new views::View();
       contents_view->SetBorder(views::Border::CreateEmptyBorder(
           kTrayPopupUserCardVerticalPadding, kSidePadding,
           kTrayPopupUserCardVerticalPadding, kSidePadding));
       contents_view->SetLayoutManager(new views::FillLayout());
-      SetBorder(views::Border::CreateEmptyBorder(0, 0, 0, 0));
+      SetBorder(nullptr);
       contents_view->AddChildView(user_card_view_);
       insets = gfx::Insets(1, 1, 1, 3);
     }
-    bool highlight = !MaterialDesignController::IsSystemTrayMenuMaterial() &&
-                     user_index_ == 0;
+    bool highlight = !UseMd() && user_index_ == 0;
     auto* button = new ButtonFromView(contents_view, this, highlight, insets);
     user_card_view_ = button;
     is_user_card_button_ = true;
   }
   AddChildViewAt(user_card_view_, 0);
   // Card for supervised user can consume more space than currently
   // available. In that case we should increase system bubble's width.
   if (login == LoginStatus::PUBLIC)
     bubble_view->SetWidth(GetPreferredSize().width());
 }
@@ skipping 102 matching lines @@
   focus_manager_ = NULL;
   if (user_card_view_->GetFocusManager())
     user_card_view_->GetFocusManager()->ClearFocus();
   popup_message_.reset();
   mouse_watcher_.reset();
   add_menu_option_.reset();
 }
 
 }  // namespace tray
 }  // namespace ash