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

Unified Diff: ash/common/system/status_area_widget.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, 5 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/status_area_widget.cc
diff --git a/ash/common/system/status_area_widget.cc b/ash/common/system/status_area_widget.cc
index a74c1457e6bd269ad9e3467a79b6e97030e4f72e..e8731061e7378b64d4978f63d0568c3194b789e2 100644
--- a/ash/common/system/status_area_widget.cc
+++ b/ash/common/system/status_area_widget.cc
@@ -67,7 +67,7 @@ void StatusAreaWidget::CreateTrayViews() {
web_notification_tray_->Initialize();
#if defined(OS_CHROMEOS)
logout_button_tray_->Initialize();
- virtual_keyboard_tray_->Initialize();
+ virtual_keyboard_tray_->InitializeTrayItems(logout_button_tray_);
varkha 2016/07/14 21:34:47 See my comment about VKT::InitializeTrayIcon. Mayb
yiyix 2016/07/26 20:27:31 N/A to the new approach
#endif
overview_button_tray_->Initialize();
SetShelfAlignment(system_tray_->shelf_alignment());
@@ -85,10 +85,11 @@ void StatusAreaWidget::Shutdown() {
delete system_tray_;
system_tray_ = NULL;
#if defined(OS_CHROMEOS)
- delete virtual_keyboard_tray_;
- virtual_keyboard_tray_ = NULL;
+ virtual_keyboard_tray_->Shutdown();
delete logout_button_tray_;
varkha 2016/07/14 21:34:47 nit: in a separate CL can you maybe make those own
yiyix 2016/07/26 20:27:31 N/A to the new approach
logout_button_tray_ = NULL;
varkha 2016/07/14 21:34:47 Is the changed order significant?
yiyix 2016/07/26 20:27:31 N/A to the new approach
+ delete virtual_keyboard_tray_;
+ virtual_keyboard_tray_ = NULL;
#endif
delete overview_button_tray_;
overview_button_tray_ = NULL;

Powered by Google App Engine
This is Rietveld 408576698