Remove pre-MD code from PowerStatusView.

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"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace ash {
 
-// Padding between battery status text and battery icon on default view.
-const int kPaddingBetweenBatteryStatusAndIcon = 3;
-
-PowerStatusView::PowerStatusView(bool default_view_right_align)
-    : default_view_right_align_(default_view_right_align),
-      percentage_label_(new views::Label),
+PowerStatusView::PowerStatusView()
+    : percentage_label_(new views::Label),
       separator_label_(new views::Label),
-      time_status_label_(new views::Label),
-      icon_(nullptr) {
-  if (MaterialDesignController::IsSystemTrayMenuMaterial())
-    SetFocusBehavior(FocusBehavior::ALWAYS);
+      time_status_label_(new views::Label) {
+  SetFocusBehavior(FocusBehavior::ALWAYS);
 
   percentage_label_->SetEnabledColor(kHeaderTextColorNormal);
   separator_label_->SetEnabledColor(kHeaderTextColorNormal);
   separator_label_->SetText(base::ASCIIToUTF16(" - "));
-  LayoutView();
+
+  // TODO(tdanderson): Tweak padding values for material design.
+  views::BoxLayout* layout = new views::BoxLayout(
+      views::BoxLayout::kHorizontal, 12, 0, kTrayPopupPaddingBetweenItems);
+  SetLayoutManager(layout);
+
+  AddChildView(percentage_label_);
+  AddChildView(separator_label_);
+  AddChildView(time_status_label_);
+
   PowerStatus::Get()->AddObserver(this);
   OnPowerStatusChanged();
 }
 
 PowerStatusView::~PowerStatusView() {
   PowerStatus::Get()->RemoveObserver(this);
 }
 
 void PowerStatusView::OnPowerStatusChanged() {
   UpdateText();
-
-  // We do not show a battery icon in the material design system menu.
-  // TODO(tdanderson): Remove the non-MD code and the IconSet enum once
-  // material design is enabled by default. See crbug.com/614453.
-  if (MaterialDesignController::UseMaterialDesignSystemIcons())

[tdanderson, 2017/04/03 22:18:02]

I think this is the last call site of
MaterialDesignController::UseMaterialDesignSystemIcons()

[Evan Stade, 2017/04/04 00:51:53]

Done.

-    return;
-
-  const PowerStatus::BatteryImageInfo info =
-      PowerStatus::Get()->GetBatteryImageInfo(PowerStatus::ICON_DARK);
-  if (info != previous_battery_image_info_) {
-    icon_->SetImage(PowerStatus::Get()->GetBatteryImage(info));
-    icon_->SetVisible(true);
-    previous_battery_image_info_ = info;

[tdanderson, 2017/04/03 22:18:02]

Can you rebase this CL against the latest ToT? There seem to be some
inconsistencies in the diff (this member doesn't exist in ToT, for instance)

[Evan Stade, 2017/04/04 00:51:53]

Done.

-  }
-}
-
-void PowerStatusView::LayoutView() {
-  if (default_view_right_align_) {
-    views::BoxLayout* layout =
-        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0,
-                             kPaddingBetweenBatteryStatusAndIcon);
-    SetLayoutManager(layout);
-
-    AddChildView(percentage_label_);
-    AddChildView(separator_label_);
-    AddChildView(time_status_label_);
-
-    icon_ = new views::ImageView;
-    AddChildView(icon_);
-
-    return;
-  }
-
-  // TODO(tdanderson): Tweak padding values for material design.
-  const bool material_design =
-      MaterialDesignController::IsSystemTrayMenuMaterial();
-  views::BoxLayout* layout = new views::BoxLayout(
-      views::BoxLayout::kHorizontal, material_design ? 12 : 0, 0,
-      kTrayPopupPaddingBetweenItems);
-  SetLayoutManager(layout);
-
-  if (!material_design) {
-    icon_ = TrayPopupUtils::CreateMainImageView();
-    AddChildView(icon_);
-  }
-
-  AddChildView(percentage_label_);
-  AddChildView(separator_label_);
-  AddChildView(time_status_label_);
 }
 
 void PowerStatusView::UpdateText() {
   const PowerStatus& status = *PowerStatus::Get();
   base::string16 battery_percentage;
   base::string16 battery_time_status;
 
   if (status.IsBatteryFull()) {
     battery_time_status =
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BATTERY_FULL);
@@ skipping 23 matching lines @@
       }
     }
   }
   percentage_label_->SetVisible(!battery_percentage.empty());
   percentage_label_->SetText(battery_percentage);
   separator_label_->SetVisible(!battery_percentage.empty() &&
                                !battery_time_status.empty());
   time_status_label_->SetVisible(!battery_time_status.empty());
   time_status_label_->SetText(battery_time_status);
 
-  if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
-    accessible_name_ = PowerStatus::Get()->GetAccessibleNameString(true);
+  accessible_name_ = PowerStatus::Get()->GetAccessibleNameString(true);
 
-    TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SYSTEM_INFO);
-    style.SetupLabel(percentage_label_);
-    style.SetupLabel(separator_label_);
-    style.SetupLabel(time_status_label_);
-  }
+  TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::SYSTEM_INFO);
+  style.SetupLabel(percentage_label_);
+  style.SetupLabel(separator_label_);
+  style.SetupLabel(time_status_label_);
 }
 
 void PowerStatusView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
 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::GetAccessibleNodeData(ui::AXNodeData* node_data) {
-  if (!MaterialDesignController::IsSystemTrayMenuMaterial())
-    return;
-
   node_data->role = ui::AX_ROLE_LABEL_TEXT;
   node_data->SetName(accessible_name_);
 }
 
 }  // namespace ash