| Index: ash/display/window_tree_host_manager_unittest.cc
|
| diff --git a/ash/display/window_tree_host_manager_unittest.cc b/ash/display/window_tree_host_manager_unittest.cc
|
| index 3148c23a4fa564d7a2a71c1dbddb37bc5ccc24e9..49c4095e7593ad84424c602ca5a272546afb3eb4 100644
|
| --- a/ash/display/window_tree_host_manager_unittest.cc
|
| +++ b/ash/display/window_tree_host_manager_unittest.cc
|
| @@ -6,13 +6,13 @@
|
|
|
| #include <memory>
|
|
|
| -#include "ash/aura/wm_window_aura.h"
|
| #include "ash/common/material_design/material_design_controller.h"
|
| #include "ash/common/shelf/shelf_widget.h"
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/common/wm/window_state.h"
|
| #include "ash/common/wm/wm_event.h"
|
| #include "ash/common/wm/wm_screen_util.h"
|
| +#include "ash/common/wm_window.h"
|
| #include "ash/display/display_util.h"
|
| #include "ash/screen_util.h"
|
| #include "ash/shell.h"
|
| @@ -1568,7 +1568,7 @@ class RootWindowTestObserver : public aura::WindowObserver {
|
| const gfx::Rect& old_bounds,
|
| const gfx::Rect& new_bounds) override {
|
| shelf_display_bounds_ =
|
| - wm::GetDisplayBoundsWithShelf(WmWindowAura::Get(window));
|
| + wm::GetDisplayBoundsWithShelf(WmWindow::Get(window));
|
| }
|
|
|
| const gfx::Rect& shelf_display_bounds() const {
|
|
|