Update CrOS logout button for MD.

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/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;
 
 const int kLogoutButtonNormalImages[] = {
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_LEFT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_TOP_RIGHT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_LEFT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_CENTER,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_RIGHT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_LEFT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_NORMAL_BOTTOM_RIGHT};
 
 const int kLogoutButtonPushedImages[] = {
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_LEFT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_TOP_RIGHT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_LEFT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_CENTER,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_RIGHT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_LEFT,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM,
     IDR_AURA_UBER_TRAY_LOGOUT_BUTTON_PUSHED_BOTTOM_RIGHT};
 
+// TODO(estade): LogoutButton is not used in MD; remove it when possible.
+// See crbug.com/614453
 class LogoutButton : public views::LabelButton {
  public:
   LogoutButton(views::ButtonListener* listener);
   ~LogoutButton() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(LogoutButton);
 };
 
 }  // namespace
@@ skipping 22 matching lines @@
   SetBorder(std::move(border));
   set_animate_on_state_change(false);
 
   SetMinSize(gfx::Size(0, GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY)));
 }
 
 LogoutButton::~LogoutButton() {}
 
 LogoutButtonTray::LogoutButtonTray(WmShelf* wm_shelf)
     : TrayBackgroundView(wm_shelf),
-      button_(NULL),
+      button_(nullptr),
       login_status_(LoginStatus::NOT_LOGGED_IN),
       show_logout_button_in_tray_(false) {
-  button_ = new LogoutButton(this);
+  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) {
@@ skipping 40 matching lines @@
   UpdateVisibility();
 }
 
 void LogoutButtonTray::UpdateVisibility() {
   SetVisible(show_logout_button_in_tray_ &&
              login_status_ != LoginStatus::NOT_LOGGED_IN &&
              login_status_ != LoginStatus::LOCKED);
 }
 
 }  // namespace ash