[ash-md] Changed the system info row height to 40 (instead of 48).

ash/common/system/chromeos/power/power_status_view.cc

 // Copyright (c) 2012 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/power/power_status_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/chromeos/power/power_status.h"
 #include "ash/common/system/chromeos/power/tray_power.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
@@ skipping 137 matching lines @@
                            TrayPopupItemStyle::FontStyle::SYSTEM_INFO);
   style.SetupLabel(percentage_label_);
   style.SetupLabel(separator_label_);
   style.SetupLabel(time_status_label_);
 }
 
 void PowerStatusView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
-gfx::Size PowerStatusView::GetPreferredSize() const {
-  gfx::Size size = views::View::GetPreferredSize();
-  return gfx::Size(size.width(), GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT));
-}
-
-int PowerStatusView::GetHeightForWidth(int width) const {
-  return GetTrayConstant(TRAY_POPUP_ITEM_MIN_HEIGHT);
-}
-
 void PowerStatusView::Layout() {
   views::View::Layout();
 
   // Move the time_status_label_, separator_label_, and percentage_label_
   // closer to each other.
   if (percentage_label_ && separator_label_ && time_status_label_ &&
       percentage_label_->visible() && time_status_label_->visible()) {
     separator_label_->SetX(percentage_label_->bounds().right() + 1);
     time_status_label_->SetX(separator_label_->bounds().right() + 1);
   }
 }
 
 void PowerStatusView::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   UpdateStyle();
 }
 
 void PowerStatusView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   if (!MaterialDesignController::IsSystemTrayMenuMaterial())
     return;
 
   node_data->role = ui::AX_ROLE_LABEL_TEXT;
   node_data->SetName(accessible_name_);
 }
 
 }  // namespace ash