| Index: ash/system/status_area_widget_delegate.cc
|
| diff --git a/ash/system/status_area_widget_delegate.cc b/ash/system/status_area_widget_delegate.cc
|
| index ad153791b1b60c2864b20c4c1645ea758ddfe9dd..017fbff61c5faf9bc5cb05a59337a71b45fb5139 100644
|
| --- a/ash/system/status_area_widget_delegate.cc
|
| +++ b/ash/system/status_area_widget_delegate.cc
|
| @@ -6,16 +6,14 @@
|
|
|
| #include "ash/ash_export.h"
|
| #include "ash/ash_switches.h"
|
| +#include "ash/common/focus_cycler.h"
|
| #include "ash/common/material_design/material_design_controller.h"
|
| #include "ash/common/shelf/shelf_constants.h"
|
| #include "ash/common/shelf/wm_shelf_util.h"
|
| #include "ash/common/shell_window_ids.h"
|
| #include "ash/common/system/tray/tray_constants.h"
|
| -#include "ash/focus_cycler.h"
|
| -#include "ash/shelf/shelf_util.h"
|
| -#include "ash/shell.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "ui/aura/window_event_dispatcher.h"
|
| #include "ui/compositor/layer.h"
|
| #include "ui/compositor/scoped_layer_animation_settings.h"
|
| #include "ui/gfx/animation/tween.h"
|
| @@ -94,8 +92,9 @@ void StatusAreaWidgetDelegate::OnGestureEvent(ui::GestureEvent* event) {
|
| bool StatusAreaWidgetDelegate::CanActivate() const {
|
| // We don't want mouse clicks to activate us, but we need to allow
|
| // activation when the user is using the keyboard (FocusCycler).
|
| - const FocusCycler* focus_cycler = focus_cycler_for_testing_ ?
|
| - focus_cycler_for_testing_ : Shell::GetInstance()->focus_cycler();
|
| + const FocusCycler* focus_cycler = focus_cycler_for_testing_
|
| + ? focus_cycler_for_testing_
|
| + : WmShell::Get()->focus_cycler();
|
| return focus_cycler->widget_activating() == GetWidget();
|
| }
|
|
|
|
|