| Index: ash/system/status_area_widget.cc
|
| diff --git a/ash/system/status_area_widget.cc b/ash/system/status_area_widget.cc
|
| index f2adc9005126b9b1d95f7335350b002f42703bc8..57d82b6955f8f6262b7c7314627eed2e98ec5bb5 100644
|
| --- a/ash/system/status_area_widget.cc
|
| +++ b/ash/system/status_area_widget.cc
|
| @@ -7,6 +7,7 @@
|
| #include "ash/common/shell_window_ids.h"
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| #include "ash/common/wm_root_window_controller.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/common/wm_window.h"
|
| #include "ash/shelf/shelf_layout_manager.h"
|
| #include "ash/shelf/shelf_widget.h"
|
| @@ -63,8 +64,7 @@ void StatusAreaWidget::CreateTrayViews() {
|
| AddVirtualKeyboardTray();
|
| #endif
|
|
|
| - SystemTrayDelegate* delegate =
|
| - ash::Shell::GetInstance()->system_tray_delegate();
|
| + SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
|
| DCHECK(delegate);
|
| // Initialize after all trays have been created.
|
| system_tray_->InitializeTrayItems(delegate);
|
|
|