diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 19:46:22 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 19:46:22 +0000 |
| commit | 995d3145768f6f2c171546853be7359e46e1f444 (patch) | |
| tree | f89bc85f412afa25452c3e28e328fa36cdd8ba5f /ui/snapshot | |
| parent | 7c34d000dcd44dcf76f43aaa97c684f37c43b526 (diff) | |
| download | chromium_src-995d3145768f6f2c171546853be7359e46e1f444.zip chromium_src-995d3145768f6f2c171546853be7359e46e1f444.tar.gz chromium_src-995d3145768f6f2c171546853be7359e46e1f444.tar.bz2 | |
Revert 266616 "Move DefaultActivationClient to wm/core"
> Move DefaultActivationClient to wm/core
>
> Several tests are using AuraTestHelper and were relying on it to set up the DefaultActivationClient, so I had to have them instantiate the DAC directly after calling SetUp() on the helper. I also had to make the DAC delete itself after the root window it's bound to is destroyed.
>
> R=sky@chromium.org
> http://crbug.com/308710
>
> Review URL: https://codereview.chromium.org/250113002
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/259103003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/snapshot')
| -rw-r--r-- | ui/snapshot/DEPS | 1 | ||||
| -rw-r--r-- | ui/snapshot/snapshot.gyp | 1 | ||||
| -rw-r--r-- | ui/snapshot/snapshot_aura_unittest.cc | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/ui/snapshot/DEPS b/ui/snapshot/DEPS index f6768d1..08ad30c 100644 --- a/ui/snapshot/DEPS +++ b/ui/snapshot/DEPS @@ -8,5 +8,4 @@ include_rules = [ "+ui/compositor", "+ui/gfx", "+ui/gl", - "+ui/wm", ] diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp index e34b0c2..1f0c645 100644 --- a/ui/snapshot/snapshot.gyp +++ b/ui/snapshot/snapshot.gyp @@ -68,7 +68,6 @@ '../aura/aura.gyp:aura_test_support', '../compositor/compositor.gyp:compositor', '../compositor/compositor.gyp:compositor_test_support', - '../wm/wm.gyp:wm', ], }], # See http://crbug.com/162998#c4 for why this is needed. diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc index eee20b3..b000ad1 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -23,7 +23,6 @@ #include "ui/gfx/size_conversions.h" #include "ui/gfx/transform.h" #include "ui/gl/gl_implementation.h" -#include "ui/wm/core/default_activation_client.h" namespace ui { namespace { @@ -94,7 +93,6 @@ class SnapshotAuraTest : public testing::Test { helper_.reset( new aura::test::AuraTestHelper(base::MessageLoopForUI::current())); helper_->SetUp(); - new ::wm::DefaultActivationClient(helper_->root_window()); } virtual void TearDown() OVERRIDE { |