Remove ash tray utility functions that are no-ops in MD.

BUG=686282

Review-Url: https://codereview.chromium.org/2750263002
Cr-Commit-Position: refs/heads/master@{#457507}

ash/common/system/chromeos/network/tray_network.cc

@@ -303,13 +303,6 @@ void TrayNetwork::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
-void TrayNetwork::UpdateAfterLoginStatusChange(LoginStatus status) {}
-
-void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
-  if (tray_)
-    SetTrayImageItemBorder(tray_, alignment);
-}
-
 void TrayNetwork::RequestToggleWifi() {
   // This will always be triggered by a user action (e.g. keyboard shortcut)
   if (!detailed_ ||

ash/common/system/chromeos/network/tray_network.h

@@ -39,8 +39,6 @@ class TrayNetwork : public SystemTrayItem,
   void DestroyTrayView() override;
   void DestroyDefaultView() override;
   void DestroyDetailedView() override;
-  void UpdateAfterLoginStatusChange(LoginStatus status) override;
-  void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
 
   // NetworkObserver
   void RequestToggleWifi() override;

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

@@ -182,14 +182,6 @@ void TrayPower::DestroyTrayView() {
   power_tray_ = NULL;
 }
 
-void TrayPower::DestroyDefaultView() {}
-
-void TrayPower::UpdateAfterLoginStatusChange(LoginStatus status) {}
-
-void TrayPower::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
-  SetTrayImageItemBorder(power_tray_, alignment);
-}
-
 void TrayPower::OnPowerStatusChanged() {
   bool battery_alert = UpdateNotificationState();
   if (power_tray_)

ash/common/system/chromeos/power/tray_power.h

@@ -73,9 +73,6 @@ class ASH_EXPORT TrayPower : public SystemTrayItem,
   views::View* CreateTrayView(LoginStatus status) override;
   views::View* CreateDefaultView(LoginStatus status) override;
   void DestroyTrayView() override;
-  void DestroyDefaultView() override;
-  void UpdateAfterLoginStatusChange(LoginStatus status) override;
-  void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
 
   // Overridden from PowerStatus::Observer.
   void OnPowerStatusChanged() override;

ash/common/system/ime/tray_ime_chromeos.cc

@@ -269,7 +269,6 @@ void TrayIME::UpdateTrayLabel(const IMEInfo& current, size_t count) {
     } else {
       tray_label_->label()->SetText(current.short_name);
     }
-    SetTrayLabelItemBorder(tray_label_, system_tray()->shelf_alignment());
     tray_label_->Layout();
   }
 }
@@ -333,13 +332,6 @@ void TrayIME::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
-void TrayIME::UpdateAfterLoginStatusChange(LoginStatus status) {}
-
-void TrayIME::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
-  SetTrayLabelItemBorder(tray_label_, alignment);
-  tray_label_->Layout();
-}
-
 void TrayIME::OnIMERefresh() {
   // Caches the current ime state.
   SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();

ash/common/system/ime/tray_ime_chromeos.h

@@ -59,8 +59,6 @@ class ASH_EXPORT TrayIME : public SystemTrayItem,
   void DestroyTrayView() override;
   void DestroyDefaultView() override;
   void DestroyDetailedView() override;
-  void UpdateAfterLoginStatusChange(LoginStatus status) override;
-  void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
 
   // Overridden from IMEObserver.
   void OnIMERefresh() override;

ash/common/system/tray/tray_image_item.cc

@@ -40,28 +40,10 @@ views::View* TrayImageItem::CreateTrayView(LoginStatus status) {
   return tray_view_;
 }
 
-views::View* TrayImageItem::CreateDefaultView(LoginStatus status) {
-  return nullptr;
-}
-
-views::View* TrayImageItem::CreateDetailedView(LoginStatus status) {
-  return nullptr;
-}
-
-void TrayImageItem::UpdateAfterLoginStatusChange(LoginStatus status) {}
-
-void TrayImageItem::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
-  SetTrayImageItemBorder(tray_view_, alignment);
-}
-
 void TrayImageItem::DestroyTrayView() {
   tray_view_ = nullptr;
 }
 
-void TrayImageItem::DestroyDefaultView() {}
-
-void TrayImageItem::DestroyDetailedView() {}
-
 void TrayImageItem::SetIconColor(SkColor color) {
   icon_color_ = color;
   UpdateImageOnImageView();

ash/common/system/tray/tray_image_item.h

@@ -36,13 +36,7 @@ class ASH_EXPORT TrayImageItem : public SystemTrayItem {
 
   // Overridden from SystemTrayItem.
   views::View* CreateTrayView(LoginStatus status) override;
-  views::View* CreateDefaultView(LoginStatus status) override;
-  views::View* CreateDetailedView(LoginStatus status) override;
   void DestroyTrayView() override;
-  void DestroyDefaultView() override;
-  void DestroyDetailedView() override;
-  void UpdateAfterLoginStatusChange(LoginStatus status) override;
-  void UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) override;
 
   // Sets the color of the icon to |color|.
   void SetIconColor(SkColor color);

ash/common/system/tray/tray_utils.cc

@@ -4,71 +4,17 @@
 
 #include "ash/common/system/tray/tray_utils.h"
 
-#include "ash/common/material_design/material_design_controller.h"
-#include "ash/common/shelf/wm_shelf_util.h"
-#include "ash/common/system/tray/tray_constants.h"
-#include "ash/common/system/tray/tray_item_view.h"
-#include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/font_list.h"
-#include "ui/gfx/geometry/vector2d.h"
-#include "ui/views/border.h"
-#include "ui/views/controls/button/label_button.h"
-#include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/controls/label.h"
 
 namespace ash {
 
 void SetupLabelForTray(views::Label* label) {
-  if (MaterialDesignController::IsShelfMaterial()) {
-    // The text is drawn on an transparent bg, so we must disable subpixel
-    // rendering.
-    label->SetSubpixelRenderingEnabled(false);
-    label->SetFontList(gfx::FontList().Derive(2, gfx::Font::NORMAL,
-                                              gfx::Font::Weight::MEDIUM));
-  } else {
-    label->SetFontList(
-        gfx::FontList().Derive(1, gfx::Font::NORMAL, gfx::Font::Weight::BOLD));
-    label->SetShadows(gfx::ShadowValues(
-        1,
-        gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0))));
-    label->SetAutoColorReadabilityEnabled(false);
-    label->SetEnabledColor(SK_ColorWHITE);
-    label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
-  }
-}
-
-void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment) {
-  if (MaterialDesignController::IsShelfMaterial())
-    return;
-
-  if (IsHorizontalAlignment(alignment)) {
-    tray_view->SetBorder(
-        views::CreateEmptyBorder(gfx::Insets(0, kTrayImageItemPadding)));
-  } else {
-    tray_view->SetBorder(views::CreateEmptyBorder(gfx::Insets(
-        kTrayImageItemPadding,
-        kTrayImageItemHorizontalPaddingVerticalAlignment)));
-  }
-}
-
-void SetTrayLabelItemBorder(TrayItemView* tray_view, ShelfAlignment alignment) {
-  if (MaterialDesignController::IsShelfMaterial())
-    return;
-
-  if (IsHorizontalAlignment(alignment)) {
-    tray_view->SetBorder(views::CreateEmptyBorder(
-        0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0,
-        kTrayLabelItemHorizontalPaddingBottomAlignment));
-  } else {
-    // Center the label for vertical launcher alignment.
-    int horizontal_padding =
-        std::max(0, (tray_view->GetPreferredSize().width() -
-                     tray_view->label()->GetPreferredSize().width()) /
-                        2);
-    tray_view->SetBorder(views::CreateEmptyBorder(
-        kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding,
-        kTrayLabelItemVerticalPaddingVerticalAlignment, horizontal_padding));
-  }
+  // The text is drawn on an transparent bg, so we must disable subpixel
+  // rendering.
+  label->SetSubpixelRenderingEnabled(false);
+  label->SetFontList(
+      gfx::FontList().Derive(2, gfx::Font::NORMAL, gfx::Font::Weight::MEDIUM));
 }
 
 }  // namespace ash

ash/common/system/tray/tray_utils.h

@@ -5,31 +5,15 @@
 #ifndef ASH_COMMON_SYSTEM_TRAY_TRAY_UTILS_H_
 #define ASH_COMMON_SYSTEM_TRAY_TRAY_UTILS_H_
 
-#include <vector>
-
-#include "ash/public/cpp/shelf_types.h"
-#include "base/strings/string16.h"
-
 namespace views {
 class Label;
-class View;
 }
 
 namespace ash {
 
-class TrayItemView;
-
 // Sets up a Label properly for the tray (sets color, font etc.).
 void SetupLabelForTray(views::Label* label);
 
-// TODO(jennyz): refactor these two functions to SystemTrayItem.
-// Sets the empty border of an image tray item for adjusting the space
-// around it.
-void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment);
-// Sets the empty border around a label tray item for adjusting the space
-// around it.
-void SetTrayLabelItemBorder(TrayItemView* tray_view, ShelfAlignment alignment);
-
 }  // namespace ash
 
 #endif  // ASH_COMMON_SYSTEM_TRAY_TRAY_UTILS_H_