diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-24 05:42:46 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-24 05:42:46 +0000 |
| commit | 55f59335f5983f427d3cad623034a6803a38c1ee (patch) | |
| tree | 48deb522fa9431e2b939941f2741dd5f8145206d /ash/wm/shadow_controller_unittest.cc | |
| parent | 0d10f2cabb86eae1e0c71413b3c1b84ea77a75f2 (diff) | |
| download | chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.zip chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.tar.gz chromium_src-55f59335f5983f427d3cad623034a6803a38c1ee.tar.bz2 | |
Rename the aura_shell namespace to ash
http://crbug.com/108457
TEST=none
TBR=sky
Review URL: http://codereview.chromium.org/9033007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115748 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/shadow_controller_unittest.cc')
| -rw-r--r-- | ash/wm/shadow_controller_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/wm/shadow_controller_unittest.cc b/ash/wm/shadow_controller_unittest.cc index 9bc581c..e67dc08 100644 --- a/ash/wm/shadow_controller_unittest.cc +++ b/ash/wm/shadow_controller_unittest.cc @@ -17,10 +17,10 @@ #include "ui/aura/window.h" #include "ui/gfx/compositor/layer.h" -namespace aura_shell { +namespace ash { namespace test { -typedef aura_shell::test::AuraShellTestBase ShadowControllerTest; +typedef ash::test::AuraShellTestBase ShadowControllerTest; // Tests that various methods in Window update the Shadow object as expected. TEST_F(ShadowControllerTest, Shadow) { @@ -32,7 +32,7 @@ TEST_F(ShadowControllerTest, Shadow) { // We should create the shadow before the window is visible (the shadow's // layer won't get drawn yet since it's a child of the window's layer). internal::ShadowController::TestApi api( - aura_shell::Shell::GetInstance()->shadow_controller()); + ash::Shell::GetInstance()->shadow_controller()); const internal::Shadow* shadow = api.GetShadowForWindow(window.get()); ASSERT_TRUE(shadow != NULL); EXPECT_TRUE(shadow->layer()->visible()); @@ -74,7 +74,7 @@ TEST_F(ShadowControllerTest, ShadowBounds) { // remain at the origin, since it's a child of the window's layer). internal::SetShadowType(window.get(), internal::SHADOW_TYPE_RECTANGULAR); internal::ShadowController::TestApi api( - aura_shell::Shell::GetInstance()->shadow_controller()); + ash::Shell::GetInstance()->shadow_controller()); const internal::Shadow* shadow = api.GetShadowForWindow(window.get()); ASSERT_TRUE(shadow != NULL); EXPECT_EQ(gfx::Rect(kOldBounds.size()).ToString(), @@ -88,4 +88,4 @@ TEST_F(ShadowControllerTest, ShadowBounds) { } } // namespace test -} // namespace aura_shell +} // namespace ash |