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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/system/ime_menu/ime_menu_tray.cc

Issue 2807693002: Make LogoutButtonTray a regular View (Closed)
Patch Set: Rebased Created 3 years, 8 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
« ash/shelf/shelf_layout_manager_unittest.cc ('K') | « ash/system/date/tray_system_info.cc ('k') | ash/system/network/tray_vpn.h » ('j') | ash/system/palette/palette_tray.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/ime_menu/ime_menu_tray.cc
diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc
index 67300afcada5a464369b7fd30353b191de3cfecc..3d75089d0472a780851f0f8936b87e114e6ba080 100644
--- a/ash/system/ime_menu/ime_menu_tray.cc
+++ b/ash/system/ime_menu/ime_menu_tray.cc
@@ -20,6 +20,7 @@
#include "ash/system/tray/system_tray_delegate.h"
#include "ash/system/tray/system_tray_notifier.h"
#include "ash/system/tray/tray_constants.h"
+#include "ash/system/tray/tray_container.h"
#include "ash/system/tray/tray_popup_item_style.h"
#include "ash/system/tray/tray_popup_utils.h"
#include "ash/system/tray/tray_utils.h"
@@ -272,7 +273,7 @@ class ImeMenuListView : public ImeListView {
} // namespace
ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf, true),
+ : TrayBackgroundView(wm_shelf),
label_(new ImeMenuLabel()),
show_keyboard_(false),
force_show_keyboard_(false),
« ash/shelf/shelf_layout_manager_unittest.cc ('K') | « ash/system/date/tray_system_info.cc ('k') | ash/system/network/tray_vpn.h » ('j') | ash/system/palette/palette_tray.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698