diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 19:45:01 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-21 19:45:01 +0000 |
| commit | af4552b2cae3064ea81de296a821c6657f8c946c (patch) | |
| tree | a8b426170bbfe9de52518973b4e485157053a76a /ash/display/display_controller_unittest.cc | |
| parent | 0e2c717e6168b2a3c59263ca03bdb6e5fdbfd262 (diff) | |
| download | chromium_src-af4552b2cae3064ea81de296a821c6657f8c946c.zip chromium_src-af4552b2cae3064ea81de296a821c6657f8c946c.tar.gz chromium_src-af4552b2cae3064ea81de296a821c6657f8c946c.tar.bz2 | |
Move some code from aura/client to wm/public
Still building as part of the aura target, will fix that in a future step.
TBR=sky@chromium.org
http://crbug.com/308710
Review URL: https://codereview.chromium.org/206453005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258651 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/display/display_controller_unittest.cc')
| -rw-r--r-- | ash/display/display_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/display/display_controller_unittest.cc b/ash/display/display_controller_unittest.cc index 6a49e2a..8c64560 100644 --- a/ash/display/display_controller_unittest.cc +++ b/ash/display/display_controller_unittest.cc @@ -20,8 +20,6 @@ #include "ash/wm/window_state.h" #include "ash/wm/wm_event.h" #include "base/command_line.h" -#include "ui/aura/client/activation_change_observer.h" -#include "ui/aura/client/activation_client.h" #include "ui/aura/client/focus_change_observer.h" #include "ui/aura/client/focus_client.h" #include "ui/aura/env.h" @@ -32,6 +30,8 @@ #include "ui/gfx/display.h" #include "ui/gfx/screen.h" #include "ui/views/widget/widget.h" +#include "ui/wm/public/activation_change_observer.h" +#include "ui/wm/public/activation_client.h" #if defined(USE_X11) #include <X11/Xlib.h> |