Remove pre-MD code from TrayItemView.

ash/common/system/tray/tray_item_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/tray/tray_item_view.h"
 
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ui/compositor/layer.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
+namespace ash {
+
 namespace {
-const int kTrayIconHeight = 29;
-const int kTrayIconWidth = 29;
+
 const int kTrayItemAnimationDurationMS = 200;
 
 // Animations can be disabled for testing.
 bool animations_enabled = true;
-}
 
-namespace ash {
+}  // namespace
 
 TrayItemView::TrayItemView(SystemTrayItem* owner)
     : owner_(owner), label_(NULL), image_view_(NULL) {
   SetPaintToLayer();
   layer()->SetFillsBoundsOpaquely(false);
   SetLayoutManager(new views::FillLayout());
 }
 
 TrayItemView::~TrayItemView() {}
 
@@ skipping 30 matching lines @@
   if (!set_visible) {
     animation_->Hide();
     AnimationProgressed(animation_.get());
   } else {
     animation_->Show();
     AnimationProgressed(animation_.get());
     views::View::SetVisible(true);
   }
 }
 
-// static
-bool TrayItemView::UseMd() {
-  return MaterialDesignController::UseMaterialDesignSystemIcons();
-}
-
 int TrayItemView::GetAnimationDurationMS() {
   return kTrayItemAnimationDurationMS;
 }
 
 gfx::Size TrayItemView::GetPreferredSize() const {
   DCHECK_EQ(1, child_count());
-  gfx::Size size;
-  if (UseMd()) {
-    gfx::Size inner_size = views::View::GetPreferredSize();
-    if (image_view_)
-      inner_size = gfx::Size(kTrayIconSize, kTrayIconSize);
-    gfx::Rect rect(inner_size);
-    rect.Inset(gfx::Insets(-kTrayImageItemPadding));
-    size = rect.size();
-  } else {
-    size = views::View::GetPreferredSize();
-    if (IsHorizontalAlignment(owner()->system_tray()->shelf_alignment()))
-      size.set_height(kTrayIconHeight);
-    else
-      size.set_width(kTrayIconWidth);
-  }
+  gfx::Size inner_size = views::View::GetPreferredSize();
+  if (image_view_)
+    inner_size = gfx::Size(kTrayIconSize, kTrayIconSize);
+  gfx::Rect rect(inner_size);
+  rect.Inset(gfx::Insets(-kTrayImageItemPadding));
+  gfx::Size size = rect.size();
   if (!animation_.get() || !animation_->is_animating())
     return size;
   if (IsHorizontalAlignment(owner()->system_tray()->shelf_alignment())) {
     size.set_width(std::max(
         1, static_cast<int>(size.width() * animation_->GetCurrentValue())));
   } else {
     size.set_height(std::max(
         1, static_cast<int>(size.height() * animation_->GetCurrentValue())));
   }
   return size;
@@ skipping 25 matching lines @@
 void TrayItemView::AnimationEnded(const gfx::Animation* animation) {
   if (animation->GetCurrentValue() < 0.1)
     views::View::SetVisible(false);
 }
 
 void TrayItemView::AnimationCanceled(const gfx::Animation* animation) {
   AnimationEnded(animation);
 }
 
 }  // namespace ash