| Index: ash/aura/wm_root_window_controller_aura.cc
|
| diff --git a/ash/aura/wm_root_window_controller_aura.cc b/ash/aura/wm_root_window_controller_aura.cc
|
| index 98f2dd71850684be4fb61c3247bacef384c1cc89..7bb3a81a365465bd3d8f09b128afb0df1cdd9e0f 100644
|
| --- a/ash/aura/wm_root_window_controller_aura.cc
|
| +++ b/ash/aura/wm_root_window_controller_aura.cc
|
| @@ -9,7 +9,6 @@
|
| #include "ash/aura/wm_window_aura.h"
|
| #include "ash/common/shelf/shelf.h"
|
| #include "ash/common/shelf/shelf_widget.h"
|
| -#include "ash/common/wm_root_window_controller_observer.h"
|
| #include "ash/display/window_tree_host_manager.h"
|
| #include "ash/root_window_controller.h"
|
| #include "ash/shell.h"
|
| @@ -17,7 +16,6 @@
|
| #include "ui/aura/window_event_dispatcher.h"
|
| #include "ui/aura/window_property.h"
|
| #include "ui/aura/window_tree_host.h"
|
| -#include "ui/display/screen.h"
|
| #include "ui/events/event_targeter.h"
|
| #include "ui/events/event_utils.h"
|
|
|
| @@ -37,14 +35,9 @@ WmRootWindowControllerAura::WmRootWindowControllerAura(
|
| root_window_controller_(root_window_controller) {
|
| root_window_controller_->GetRootWindow()->SetProperty(
|
| kWmRootWindowControllerKey, this);
|
| - WmShell::Get()->AddShellObserver(this);
|
| - display::Screen::GetScreen()->AddObserver(this);
|
| }
|
|
|
| -WmRootWindowControllerAura::~WmRootWindowControllerAura() {
|
| - WmShell::Get()->RemoveShellObserver(this);
|
| - display::Screen::GetScreen()->RemoveObserver(this);
|
| -}
|
| +WmRootWindowControllerAura::~WmRootWindowControllerAura() {}
|
|
|
| // static
|
| const WmRootWindowControllerAura* WmRootWindowControllerAura::Get(
|
| @@ -115,27 +108,4 @@ gfx::Point WmRootWindowControllerAura::GetLastMouseLocationInRoot() {
|
| ->GetLastMouseLocationInRoot();
|
| }
|
|
|
| -void WmRootWindowControllerAura::OnShelfAlignmentChanged(
|
| - WmWindow* root_window) {
|
| - if (WmWindowAura::GetAuraWindow(root_window) !=
|
| - root_window_controller_->GetRootWindow())
|
| - return;
|
| -
|
| - FOR_EACH_OBSERVER(WmRootWindowControllerObserver, *observers(),
|
| - OnShelfAlignmentChanged());
|
| -}
|
| -
|
| -void WmRootWindowControllerAura::OnDisplayAdded(
|
| - const display::Display& display) {}
|
| -
|
| -void WmRootWindowControllerAura::OnDisplayRemoved(
|
| - const display::Display& display) {}
|
| -
|
| -void WmRootWindowControllerAura::OnDisplayMetricsChanged(
|
| - const display::Display& display,
|
| - uint32_t metrics) {
|
| - FOR_EACH_OBSERVER(WmRootWindowControllerObserver, *observers(),
|
| - OnWorkAreaChanged());
|
| -}
|
| -
|
| } // namespace ash
|
|
|