Index: ash/common/system/tray/tray_popup_utils.cc |
diff --git a/ash/common/system/tray/tray_popup_utils.cc b/ash/common/system/tray/tray_popup_utils.cc |
index cc04e18754936e87b843fe393fb76cc577af4f76..847d665698238b4a2a002a431c283d4d733f47b1 100644 |
--- a/ash/common/system/tray/tray_popup_utils.cc |
+++ b/ash/common/system/tray/tray_popup_utils.cc |
@@ -9,7 +9,6 @@ |
#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" |
@@ -233,15 +232,9 @@ views::ImageView* TrayPopupUtils::CreateMoreImageView() { |
} |
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 fun
tdanderson
2017/02/16 22:03:50
+1
Evan Stade
2017/02/16 22:48:01
Done.
|
return slider; |
} |