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

Unified Diff: ash/system/status_area_widget.cc

Issue 2112403002: NOSUBMIT: Initialize a StatusAreaWidget inside ash wm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « ash/mus/window_manager_application.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/status_area_widget.cc
diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
index 9493286d35404a296c550d9440e0e270887cb45f..138b2c7cb60d1a40a4b89e6d36baefe58b35c777 100644
--- a/ash/system/status_area_widget.cc
+++ b/ash/system/status_area_widget.cc
@@ -57,7 +57,7 @@ void StatusAreaWidget::CreateTrayViews() {
AddWebNotificationTray();
#if defined(OS_CHROMEOS)
AddLogoutButtonTray();
- AddVirtualKeyboardTray();
+ // AddVirtualKeyboardTray();
#endif
SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
@@ -67,11 +67,12 @@ void StatusAreaWidget::CreateTrayViews() {
web_notification_tray_->Initialize();
#if defined(OS_CHROMEOS)
logout_button_tray_->Initialize();
- virtual_keyboard_tray_->Initialize();
+ // virtual_keyboard_tray_->Initialize();
#endif
overview_button_tray_->Initialize();
SetShelfAlignment(system_tray_->shelf_alignment());
- UpdateAfterLoginStatusChange(delegate->GetUserLoginStatus());
+ // overview button tray ash::Shell access
+ //UpdateAfterLoginStatusChange(delegate->GetUserLoginStatus());
}
void StatusAreaWidget::Shutdown() {
@@ -121,7 +122,7 @@ void StatusAreaWidget::SchedulePaint() {
web_notification_tray_->SchedulePaint();
system_tray_->SchedulePaint();
#if defined(OS_CHROMEOS)
- virtual_keyboard_tray_->SchedulePaint();
+ // virtual_keyboard_tray_->SchedulePaint();
logout_button_tray_->SchedulePaint();
#endif
overview_button_tray_->SchedulePaint();
« no previous file with comments | « ash/mus/window_manager_application.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698