diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:31:49 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 15:31:49 +0000 |
| commit | 521c703f8d62fa698c3e88287c64d8d23f9ac675 (patch) | |
| tree | 2e50833697a511a3cbc1f589fc4e17d466b82f03 /ui/views/corewm/tooltip_controller_unittest.cc | |
| parent | 46e49bdb2dcac1f906d01c8373e9fc3c8ce2186c (diff) | |
| download | chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.zip chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.tar.gz chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.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
Review URL: https://codereview.chromium.org/196063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/corewm/tooltip_controller_unittest.cc')
| -rw-r--r-- | ui/views/corewm/tooltip_controller_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/views/corewm/tooltip_controller_unittest.cc b/ui/views/corewm/tooltip_controller_unittest.cc index 772ba33..39cab8e 100644 --- a/ui/views/corewm/tooltip_controller_unittest.cc +++ b/ui/views/corewm/tooltip_controller_unittest.cc @@ -76,7 +76,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase { virtual ~TooltipControllerTest() {} virtual void SetUp() OVERRIDE { - wm_state_.reset(new views::corewm::WMState); + wm_state_.reset(new wm::WMState); aura::test::AuraTestBase::SetUp(); #if defined(OS_CHROMEOS) controller_.reset(new TooltipController( @@ -137,7 +137,7 @@ class TooltipControllerTest : public aura::test::AuraTestBase { ui::ScopedOleInitializer ole_initializer_; #endif - scoped_ptr<views::corewm::WMState> wm_state_; + scoped_ptr<wm::WMState> wm_state_; DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest); }; @@ -695,10 +695,10 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase { virtual ~TooltipControllerTest2() {} virtual void SetUp() OVERRIDE { - wm_state_.reset(new views::corewm::WMState); + wm_state_.reset(new wm::WMState); aura::test::AuraTestBase::SetUp(); controller_.reset(new TooltipController( - scoped_ptr<views::corewm::Tooltip>(test_tooltip_))); + scoped_ptr<corewm::Tooltip>(test_tooltip_))); root_window()->AddPreTargetHandler(controller_.get()); SetTooltipClient(root_window(), controller_.get()); helper_.reset(new TooltipControllerTestHelper(controller_.get())); @@ -723,7 +723,7 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase { private: scoped_ptr<TooltipController> controller_; - scoped_ptr<views::corewm::WMState> wm_state_; + scoped_ptr<wm::WMState> wm_state_; DISALLOW_COPY_AND_ASSIGN(TooltipControllerTest2); }; |