ash: Use legacy size for legacy logout button.

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"
@@ skipping 101 matching lines @@
     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_ = button;
   } else {
     button_ = new LogoutButton(this);
   }
   tray_container()->AddChildView(button_);
-  if (!ash::MaterialDesignController::IsShelfMaterial())
+  if (!MaterialDesignController::IsShelfMaterial())
     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.
   UpdateButtonTextAndImage(login_status_, alignment);
   TrayBackgroundView::SetShelfAlignment(alignment);
-  if (!ash::MaterialDesignController::IsShelfMaterial())
+  if (!MaterialDesignController::IsShelfMaterial())
     tray_container()->SetBorder(views::Border::NullBorder());
 }
 
 base::string16 LogoutButtonTray::GetAccessibleNameForTray() {
   return button_->GetText();
 }
 
 void LogoutButtonTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {}
 
@@ skipping 28 matching lines @@
   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);
+  const int kButtonMinSize = MaterialDesignController::IsShelfMaterial()

[sadrul, 2016/10/12 00:43:42]

I think this would just be 'const int button_size = ...';

[xiyuan, 2016/10/12 15:28:11]

Done.

+                                 ? kTrayItemSize
+                                 : GetTrayConstant(TRAY_ITEM_HEIGHT_LEGACY);
   if (alignment == SHELF_ALIGNMENT_BOTTOM) {
     button_->SetText(title);
     button_->SetImage(views::LabelButton::STATE_NORMAL, gfx::ImageSkia());
-    button_->SetMinSize(gfx::Size(0, kTrayItemSize));
+    button_->SetMinSize(gfx::Size(0, kButtonMinSize));
   } else {
     button_->SetText(base::string16());
     button_->SetAccessibleName(title);
     button_->SetImage(
         views::LabelButton::STATE_NORMAL,
         gfx::CreateVectorIcon(gfx::VectorIconId::SHELF_LOGOUT, kTrayIconColor));
-    button_->SetMinSize(gfx::Size(kTrayItemSize, kTrayItemSize));
+    button_->SetMinSize(gfx::Size(kButtonMinSize, kButtonMinSize));
   }
   UpdateVisibility();
 }
 
 }  // namespace ash