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

Unified Diff: ash/common/system/chromeos/ime_menu/ime_menu_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
Index: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
index 90653113bbdd5b6ef3915f6b7c608fa80b42ced0..40be0de319c5b857371ab80b684328a77e601fdb 100644
--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
@@ -362,12 +362,9 @@ ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
should_block_shelf_auto_hide_(false),
keyboard_suppressed_(false),
show_bubble_after_keyboard_hidden_(false) {
- if (MaterialDesignController::IsShelfMaterial()) {
+ if (MaterialDesignController::IsShelfMaterial())
SetInkDropMode(InkDropMode::ON);
- SetContentsBackground(false);
- } else {
- SetContentsBackground(true);
- }
+ SetContentsBackground();
SetupLabelForTray(label_);
tray_container()->AddChildView(label_);
SystemTrayNotifier* tray_notifier = WmShell::Get()->system_tray_notifier();
« no previous file with comments | « no previous file | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | ash/common/system/tray/tray_background_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698