| Index: ash/aura/shell_port_classic.cc
|
| diff --git a/ash/aura/shell_port_classic.cc b/ash/aura/shell_port_classic.cc
|
| index c42a9f41d5ce6fdca7fb8548b2377be8d2e302b3..4603cb55d4f92351e7d75124f9de1ea8f1c11cd3 100644
|
| --- a/ash/aura/shell_port_classic.cc
|
| +++ b/ash/aura/shell_port_classic.cc
|
| @@ -18,7 +18,6 @@
|
| #include "ash/magnifier/partial_magnification_controller.h"
|
| #include "ash/metrics/task_switch_metrics_recorder.h"
|
| #include "ash/public/cpp/config.h"
|
| -#include "ash/session/session_state_delegate.h"
|
| #include "ash/shared/immersive_fullscreen_controller.h"
|
| #include "ash/shell.h"
|
| #include "ash/shell_delegate.h"
|
| @@ -48,7 +47,6 @@
|
|
|
| #if defined(USE_OZONE)
|
| #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_ozone.h"
|
| -#include "ui/display/types/native_display_delegate.h"
|
| #include "ui/ozone/public/ozone_platform.h"
|
| #endif
|
|
|
| @@ -218,10 +216,6 @@ std::unique_ptr<KeyEventWatcher> ShellPortClassic::CreateKeyEventWatcher() {
|
| return base::MakeUnique<KeyEventWatcherAura>();
|
| }
|
|
|
| -SessionStateDelegate* ShellPortClassic::GetSessionStateDelegate() {
|
| - return Shell::Get()->session_state_delegate();
|
| -}
|
| -
|
| void ShellPortClassic::AddDisplayObserver(WmDisplayObserver* observer) {
|
| if (!added_display_observer_) {
|
| added_display_observer_ = true;
|
|
|