| 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 368f3ca76bdd719c7f5fe601f46ef9b41c09d153..21964424a5dc01decd82cd9c7d7bb716bc8de349 100644
|
| --- a/ash/aura/wm_root_window_controller_aura.cc
|
| +++ b/ash/aura/wm_root_window_controller_aura.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "ash/aura/wm_root_window_controller_aura.h"
|
|
|
| -#include "ash/aura/wm_shell_aura.h"
|
| #include "ash/aura/wm_window_aura.h"
|
| #include "ash/common/shelf/shelf_widget.h"
|
| #include "ash/common/shelf/wm_shelf.h"
|
| @@ -61,10 +60,6 @@ bool WmRootWindowControllerAura::HasShelf() {
|
| return root_window_controller_->wm_shelf()->shelf_widget() != nullptr;
|
| }
|
|
|
| -WmShell* WmRootWindowControllerAura::GetShell() {
|
| - return WmShell::Get();
|
| -}
|
| -
|
| WmShelf* WmRootWindowControllerAura::GetShelf() {
|
| return root_window_controller_->wm_shelf();
|
| }
|
|
|