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

Unified Diff: ash/common/system/chromeos/ime_menu/ime_menu_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
« no previous file with comments | « no previous file | ash/common/system/chromeos/palette/palette_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a2c8013510a6486c36038d883c8b47f3070ed7e6..bb4ae9566f7808cc8870c037e1f16cdb0e1d9b06 100644
--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
@@ -349,19 +349,15 @@ class ImeMenuListView : public ImeListView {
} // namespace
ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf),
+ : TrayBackgroundView(wm_shelf, true),
label_(new ImeMenuLabel()),
show_keyboard_(false),
force_show_keyboard_(false),
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);
- }
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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698