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

Unified Diff: ash/common/wm_root_window_controller.cc

Issue 2489723005: chromeos: Make system tray audio item observe CrasAudioHandler directly (Closed)
Patch Set: rebase Created 4 years, 1 month 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/common/wm_root_window_controller.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm_root_window_controller.cc
diff --git a/ash/common/wm_root_window_controller.cc b/ash/common/wm_root_window_controller.cc
index 4b5048e0eff13099887bf99c7e384f21a9d70bdb..d4f1be97d9218ac924a4ddc0816d970d8b4a278e 100644
--- a/ash/common/wm_root_window_controller.cc
+++ b/ash/common/wm_root_window_controller.cc
@@ -224,6 +224,13 @@ void WmRootWindowController::ShowShelf() {
shelf->shelf_widget()->status_area_widget()->Show();
}
+SystemTray* WmRootWindowController::GetSystemTray() {
+ ShelfWidget* shelf_widget = GetShelf()->shelf_widget();
+ if (!shelf_widget || !shelf_widget->status_area_widget())
+ return nullptr;
+ return shelf_widget->status_area_widget()->system_tray();
+}
+
WmWindow* WmRootWindowController::GetContainer(int container_id) {
return root_->GetChildByShellWindowId(container_id);
}
« no previous file with comments | « ash/common/wm_root_window_controller.h ('k') | chrome/browser/ui/ash/system_tray_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698