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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2723843002: Remove non-MD code from TrayBackgroundView (Closed)
Patch Set: Removed extra resources 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
« no previous file with comments | « ash/common/system/chromeos/ime_menu/ime_menu_tray.cc ('k') | ash/common/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | ash/common/system/tray/tray_background_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..2352ab035992bc9a6a5d8d66b688d472619c7013 100644
--- a/ash/common/system/chromeos/palette/palette_tray.cc
+++ b/ash/common/system/chromeos/palette/palette_tray.cc
@@ -156,12 +156,9 @@ PaletteTray::PaletteTray(WmShelf* wm_shelf)
weak_factory_(this) {
PaletteTool::RegisterToolInstances(palette_tool_manager_.get());
- if (MaterialDesignController::IsShelfMaterial()) {
+ if (MaterialDesignController::IsShelfMaterial())
SetInkDropMode(InkDropMode::ON);
- SetContentsBackground(false);
- } else {
- SetContentsBackground(true);
- }
+ SetContentsBackground();
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/virtual_keyboard/virtual_keyboard_tray.cc » ('j') | ash/common/system/tray/tray_background_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698