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

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

Issue 2723843002: Remove non-MD code from TrayBackgroundView (Closed)
Patch Set: Rebased Created 3 years, 9 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 4fc29227756af3733883ae509cca36df7215bd8e..c869f94a610a3dc2d0cf571148ed82587ff9a7cb 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -150,17 +150,13 @@ class TitleView : public views::View, public views::ButtonListener {
} // namespace
PaletteTray::PaletteTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf),
+ : TrayBackgroundView(wm_shelf, true),
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();
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | ash/common/system/chromeos/session/logout_button_tray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698