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

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

Issue 2147143002: [Chrome OS MD] Draw a 1px separator between 2 tray items (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 4 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 5b9cd38b88a8bb2f1deb7240b993a381c04807e3..c6aca1abb5c29670e8e83a3bb5c5c7ce2788249f 100644
--- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
+++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc
@@ -5,6 +5,7 @@
#include "ash/common/system/chromeos/ime_menu/ime_menu_tray.h"
#include "ash/common/session/session_state_delegate.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
#include "ash/common/shelf/wm_shelf_util.h"
#include "ash/common/shell_window_ids.h"
#include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
@@ -137,8 +138,9 @@ class ImeButtonsView : public views::View, public views::ButtonListener {
} // namespace
-ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
- : TrayBackgroundView(wm_shelf), label_(new ImeMenuLabel()) {
+ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf, WmShelfObserver* wm_shelf_observer)
+ : TrayBackgroundView(wm_shelf, wm_shelf_observer),
+ label_(new ImeMenuLabel()) {
SetupLabelForTray(label_);
tray_container()->AddChildView(label_);
SetContentsBackground();

Powered by Google App Engine
This is Rietveld 408576698