diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 22:16:32 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-29 22:16:32 +0000 |
| commit | 27ba49bfeddc1102269de716e66f777de8da6ff2 (patch) | |
| tree | 3e16ab5440c2bb979ba71175242a88572ab346fe /ui/snapshot | |
| parent | cecf1d365910d8a22511e703b741bf52be56c740 (diff) | |
| download | chromium_src-27ba49bfeddc1102269de716e66f777de8da6ff2.zip chromium_src-27ba49bfeddc1102269de716e66f777de8da6ff2.tar.gz chromium_src-27ba49bfeddc1102269de716e66f777de8da6ff2.tar.bz2 | |
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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266616
Review URL: https://codereview.chromium.org/250113002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266975 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, 4 insertions, 0 deletions
diff --git a/ui/snapshot/DEPS b/ui/snapshot/DEPS index 08ad30c..f6768d1 100644 --- a/ui/snapshot/DEPS +++ b/ui/snapshot/DEPS @@ -8,4 +8,5 @@ include_rules = [ "+ui/compositor", "+ui/gfx", "+ui/gl", + "+ui/wm", ] diff --git a/ui/snapshot/snapshot.gyp b/ui/snapshot/snapshot.gyp index 1f0c645..e34b0c2 100644 --- a/ui/snapshot/snapshot.gyp +++ b/ui/snapshot/snapshot.gyp @@ -68,6 +68,7 @@ '../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 b000ad1..eee20b3 100644 --- a/ui/snapshot/snapshot_aura_unittest.cc +++ b/ui/snapshot/snapshot_aura_unittest.cc @@ -23,6 +23,7 @@ #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 { @@ -93,6 +94,7 @@ 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 { |