| Index: ash/wm/aura/wm_window_aura.cc
|
| diff --git a/ash/wm/aura/wm_window_aura.cc b/ash/wm/aura/wm_window_aura.cc
|
| index 2037bdddb0f164b1f32244231831d45e8192705f..2a09ff622254e87dc08547ecd4e15e23d966b1a9 100644
|
| --- a/ash/wm/aura/wm_window_aura.cc
|
| +++ b/ash/wm/aura/wm_window_aura.cc
|
| @@ -76,11 +76,6 @@ WmWindowAura::WmWindowAura(aura::Window* window)
|
| }
|
|
|
| // static
|
| -WmWindow* WmWindow::Get(views::Widget* widget) {
|
| - return WmWindowAura::Get(widget->GetNativeWindow());
|
| -}
|
| -
|
| -// static
|
| WmWindow* WmWindowAura::Get(aura::Window* window) {
|
| if (!window)
|
| return nullptr;
|
| @@ -117,7 +112,7 @@ WmRootWindowController* WmWindowAura::GetRootWindowController() {
|
| }
|
|
|
| WmGlobals* WmWindowAura::GetGlobals() const {
|
| - return WmGlobalsAura::Get();
|
| + return WmGlobals::Get();
|
| }
|
|
|
| void WmWindowAura::SetShellWindowId(int id) {
|
|
|