| Index: ash/wm/workspace/workspace_layout_manager2.cc
|
| diff --git a/ash/wm/workspace/workspace_layout_manager2.cc b/ash/wm/workspace/workspace_layout_manager2.cc
|
| index fc4a71a317e4353d5f67fb9c91e8975322d3fe81..b19041c5f32a49aaa5a9ed9e4298f12f9f1f81ff 100644
|
| --- a/ash/wm/workspace/workspace_layout_manager2.cc
|
| +++ b/ash/wm/workspace/workspace_layout_manager2.cc
|
| @@ -5,12 +5,12 @@
|
| #include "ash/wm/workspace/workspace_layout_manager2.h"
|
|
|
| #include "ash/ash_switches.h"
|
| -#include "ash/shell.h"
|
| #include "ash/screen_ash.h"
|
| +#include "ash/shell.h"
|
| #include "ash/wm/always_on_top_controller.h"
|
| #include "ash/wm/window_animations.h"
|
| -#include "ash/wm/window_util.h"
|
| #include "ash/wm/window_properties.h"
|
| +#include "ash/wm/window_util.h"
|
| #include "ash/wm/workspace/workspace2.h"
|
| #include "ash/wm/workspace/workspace_manager2.h"
|
| #include "base/auto_reset.h"
|
| @@ -19,7 +19,7 @@
|
| #include "ui/aura/root_window.h"
|
| #include "ui/aura/window.h"
|
| #include "ui/aura/window_observer.h"
|
| -#include "ui/base/event.h"
|
| +#include "ui/base/events/event.h"
|
| #include "ui/base/ui_base_types.h"
|
|
|
| using aura::Window;
|
|
|