Index: ash/common/system/chromeos/palette/palette_tray.cc |
diff --git a/ash/common/system/chromeos/palette/palette_tray.cc b/ash/common/system/chromeos/palette/palette_tray.cc |
index eccef71de33a8b82072ccb4f72070538ec570b83..b051526b7a26e23d38965cd342691b75b17d0d99 100644 |
--- a/ash/common/system/chromeos/palette/palette_tray.cc |
+++ b/ash/common/system/chromeos/palette/palette_tray.cc |
@@ -151,17 +151,13 @@ class TitleView : public views::View, public views::ButtonListener { |
} // namespace |
PaletteTray::PaletteTray(WmShelf* wm_shelf) |
- : TrayBackgroundView(wm_shelf), |
+ : TrayBackgroundView(wm_shelf, false), |
palette_tool_manager_(new PaletteToolManager(this)), |
weak_factory_(this) { |
PaletteTool::RegisterToolInstances(palette_tool_manager_.get()); |
- if (MaterialDesignController::IsShelfMaterial()) { |
+ if (MaterialDesignController::IsShelfMaterial()) |
SetInkDropMode(InkDropMode::ON); |
- SetContentsBackground(false); |
- } else { |
- SetContentsBackground(true); |
- } |
SetLayoutManager(new views::FillLayout()); |
icon_ = new views::ImageView(); |