Remove last MD reference from TrayPopupUtils.

ash/common/system/tray/tray_popup_utils.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be

[tdanderson, 2017/02/16 22:03:50]

nit: please also include BUG=686215 in the CL description

[Evan Stade, 2017/02/16 22:48:01]

Done.

 // found in the LICENSE file.
 
 #include "ash/common/system/tray/tray_popup_utils.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "ash/common/ash_constants.h"
 #include "ash/common/ash_view_ids.h"
-#include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/size_range_layout.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/wm_shell.h"
 #include "base/memory/ptr_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_highlight.h"
@@ skipping 203 matching lines @@
 
 views::ImageView* TrayPopupUtils::CreateMoreImageView() {
   views::ImageView* image =
       new FixedSizedImageView(GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_SIZE),
                               GetTrayConstant(TRAY_POPUP_ITEM_MORE_IMAGE_SIZE));
   image->EnableCanvasFlippingForRTLUI(true);
   return image;
 }
 
 views::Slider* TrayPopupUtils::CreateSlider(views::SliderListener* listener) {
-  const bool is_material = MaterialDesignController::IsSystemTrayMenuMaterial();
-  views::Slider* slider = views::Slider::CreateSlider(is_material, listener);
-  if (is_material) {
-    slider->SetBorder(
-        views::CreateEmptyBorder(gfx::Insets(0, kTrayPopupSliderPaddingMD)));
-  } else {
-    slider->SetBorder(
-        views::CreateEmptyBorder(0, 0, 0, kTrayPopupPaddingBetweenItems));
-  }
+  views::Slider* slider = new views::Slider(listener);
+  slider->SetBorder(
+      views::CreateEmptyBorder(gfx::Insets(0, kTrayPopupSliderPaddingMD)));

[msw, 2017/02/16 21:08:20]

nit: drop 'MD' from constant (and move to this function, its only user?)

[tdanderson, 2017/02/16 22:03:50]

+1

[Evan Stade, 2017/02/16 22:48:01]

Done.

   return slider;
 }
 
 views::ToggleButton* TrayPopupUtils::CreateToggleButton(
     views::ButtonListener* listener,
     int accessible_name_id) {
   views::ToggleButton* toggle = new views::ToggleButton(listener);
   const gfx::Size toggle_size(toggle->GetPreferredSize());
   const int vertical_padding = (kMenuButtonSize - toggle_size.height()) / 2;
   const int horizontal_padding =
@@ skipping 188 matching lines @@
 bool TrayPopupUtils::CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 }  // namespace ash