Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1040)

Unified Diff: ash/common/system/chromeos/palette/palette_tray.cc

Issue 2723843002: Remove non-MD code from TrayBackgroundView (Closed)
Patch Set: Removed unnecessary methods Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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();

Powered by Google App Engine
This is Rietveld 408576698