diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 22:54:17 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 22:54:17 +0000 |
| commit | 1bb2aa70728ab0b8917b9c44284bd22f591b1ea0 (patch) | |
| tree | 3d1c20241b5236a9e6911f1ef01629268259a201 /ash/test/ash_test_helper.h | |
| parent | 78887cf9abd2a730fe4a784ddfe3251929717cc3 (diff) | |
| download | chromium_src-1bb2aa70728ab0b8917b9c44284bd22f591b1ea0.zip chromium_src-1bb2aa70728ab0b8917b9c44284bd22f591b1ea0.tar.gz chromium_src-1bb2aa70728ab0b8917b9c44284bd22f591b1ea0.tar.bz2 | |
Revert "Move wm/core to wm namespace."
This reverts commit 067d7fe616a07011b9e2d2609fc65af8db6a7dfb.
Broke the build:
http://build.chromium.org/p/chromium.mac/builders/Mac%20Builder%20%28dbg%29/builds/63598/steps/compile/logs/stdio
BUG=
TBR=ben
Review URL: https://codereview.chromium.org/198283002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256686 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/test/ash_test_helper.h')
| -rw-r--r-- | ash/test/ash_test_helper.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ash/test/ash_test_helper.h b/ash/test/ash_test_helper.h index a1974cb..706cfeb 100644 --- a/ash/test/ash_test_helper.h +++ b/ash/test/ash_test_helper.h @@ -20,9 +20,11 @@ namespace ui { class ScopedAnimationDurationScaleMode; } // namespace ui -namespace wm { +namespace views { +namespace corewm { class WMState; } +} namespace ash { namespace test { @@ -66,7 +68,7 @@ class AshTestHelper { // Owned by ash::AcceleratorController TestScreenshotDelegate* test_screenshot_delegate_; - scoped_ptr<wm::WMState> wm_state_; + scoped_ptr<views::corewm::WMState> wm_state_; // Check if DBus Thread Manager was initialized here. bool dbus_thread_manager_initialized_; |