Better CrOS logout button for vertical trays.

ash/common/system/chromeos/session/logout_button_tray.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/chromeos/session/logout_button_tray.h"
 
 #include <memory>
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/system/chromeos/session/logout_confirmation_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/system/user/login_status.h"
 #include "ash/common/wm_shell.h"
 #include "base/logging.h"
 #include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/events/event.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/gfx/paint_vector_icon.h"
+#include "ui/gfx/vector_icons_public.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace {
 
 const int kLogoutButtonHorizontalExtraPadding = 7;
@@ skipping 69 matching lines @@
       show_logout_button_in_tray_(false) {
   if (MaterialDesignController::IsShelfMaterial()) {
     views::MdTextButton* button =
         views::MdTextButton::CreateMdButton(this, base::string16());
     button->SetCallToAction(true);
     button->set_bg_color_override(gfx::kGoogleRed700);
     // Base font size + 2 = 14.
     // TODO(estade): should this 2 be shared with other tray views? See
     // crbug.com/623987
     button->AdjustFontSize(2);
-    button->SetMinSize(gfx::Size(0, kTrayItemSize));
     button_ = button;
   } else {
     button_ = new LogoutButton(this);
   }
   tray_container()->AddChildView(button_);
   tray_container()->SetBorder(views::Border::NullBorder());
   WmShell::Get()->system_tray_notifier()->AddLogoutButtonObserver(this);
 }
 
 LogoutButtonTray::~LogoutButtonTray() {
   WmShell::Get()->system_tray_notifier()->RemoveLogoutButtonObserver(this);
 }
 
 void LogoutButtonTray::SetShelfAlignment(ShelfAlignment alignment) {
+  // We must first update the button so that
+  // TrayBackgroundView::SetShelfAlignment can lay it out correctly.

[tdanderson, 2016/08/08 15:57:35]

nit: () after SetShelfAlignment

[Evan Stade, 2016/08/08 16:00:57]

will do

+  UpdateButtonTextAndImage(login_status_, alignment);
   TrayBackgroundView::SetShelfAlignment(alignment);
   tray_container()->SetBorder(views::Border::NullBorder());
 }
 
 base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
   return button_->GetText();
 }
 
 void LogoutButtonTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {}
@@ skipping 15 matching lines @@
   if (dialog_duration_ <= base::TimeDelta()) {
     // Sign out immediately if |dialog_duration_| is non-positive.
     WmShell::Get()->system_tray_delegate()->SignOut();
   } else if (WmShell::Get()->logout_confirmation_controller()) {
     WmShell::Get()->logout_confirmation_controller()->ConfirmLogout(
         base::TimeTicks::Now() + dialog_duration_);
   }
 }
 
 void LogoutButtonTray::UpdateAfterLoginStatusChange(LoginStatus login_status) {
-  login_status_ = login_status;
-  const base::string16 title =
-      user::GetLocalizedSignOutStringForStatus(login_status, false);
-  button_->SetText(title);
-  button_->SetAccessibleName(title);
-  UpdateVisibility();
+  UpdateButtonTextAndImage(login_status, shelf_alignment());
 }
 
 void LogoutButtonTray::UpdateVisibility() {
   SetVisible(show_logout_button_in_tray_ &&
              login_status_ != LoginStatus::NOT_LOGGED_IN &&
              login_status_ != LoginStatus::LOCKED);
 }
 
+void LogoutButtonTray::UpdateButtonTextAndImage(LoginStatus login_status,
+                                                ShelfAlignment alignment) {
+  login_status_ = login_status;
+  const base::string16 title =
+      user::GetLocalizedSignOutStringForStatus(login_status, false);
+  if (alignment == SHELF_ALIGNMENT_BOTTOM) {
+    button_->SetText(title);
+    button_->SetImage(views::LabelButton::STATE_NORMAL, gfx::ImageSkia());
+    button_->SetMinSize(gfx::Size(0, kTrayItemSize));
+  } else {
+    button_->SetText(base::string16());
+    button_->SetImage(
+        views::LabelButton::STATE_NORMAL,
+        gfx::CreateVectorIcon(gfx::VectorIconId::ASH_LOGOUT, kTrayIconColor));
+    button_->SetMinSize(gfx::Size(kTrayItemSize, kTrayItemSize));
+  }
+  button_->SetAccessibleName(title);

[sadrul, 2016/08/08 20:25:08]

Do you need to explicitly do this (since LabelButton::SetText() already does
this too)?

[Evan Stade, 2016/08/08 22:40:54]

it's necessary in the vertical shelf case. Moved to inside the else branch.

+  UpdateVisibility();
+}
+
 }  // namespace ash