diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 19:56:14 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 19:56:14 +0000 |
| commit | e319c7ec34024b7c06ee300303b6927063f255f7 (patch) | |
| tree | 1778920d6f5299c325df18b8c278f6618db172a6 /ash/test/ash_test_helper.cc | |
| parent | 0706341097163814a7bacf89aec118ebfd5ba69c (diff) | |
| download | chromium_src-e319c7ec34024b7c06ee300303b6927063f255f7.zip chromium_src-e319c7ec34024b7c06ee300303b6927063f255f7.tar.gz chromium_src-e319c7ec34024b7c06ee300303b6927063f255f7.tar.bz2 | |
Move wm/core to wm namespace.
Also sets up new targets for wm_core, wm_core_unittests, etc.
R=sky@chromium.org
TBR=sky@chromium.org
BUG=
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256839
Review URL: https://codereview.chromium.org/196063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_helper.cc')
| -rw-r--r-- | ash/test/ash_test_helper.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc index 50e9841..33dbb83 100644 --- a/ash/test/ash_test_helper.cc +++ b/ash/test/ash_test_helper.cc @@ -52,7 +52,7 @@ AshTestHelper::~AshTestHelper() { } void AshTestHelper::SetUp(bool start_session) { - wm_state_.reset(new views::corewm::WMState); + wm_state_.reset(new wm::WMState); // Disable animations during tests. zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode( @@ -126,7 +126,7 @@ void AshTestHelper::TearDown() { ui::ShutdownInputMethodForTesting(); zero_duration_mode_.reset(); - CHECK(!views::corewm::ScopedCaptureClient::IsActive()); + CHECK(!wm::ScopedCaptureClient::IsActive()); wm_state_.reset(); } |