diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
| commit | 39dd9bc271d69d85d3189847b01e911d8ac7aeda (patch) | |
| tree | fd3c3a40714a2b2dae82b2466517969138024d45 /ash/wm/workspace_controller_unittest.cc | |
| parent | 9a6cfefacd9f3509fd3b85f453fb4e5dd1f001d7 (diff) | |
| download | chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.zip chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.gz chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.bz2 | |
Revert "Move wm/core to wm namespace."
This reverts commit 521c703f8d62fa698c3e88287c64d8d23f9ac675.
Broke gyp
BUG=
Review URL: https://codereview.chromium.org/199263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/workspace_controller_unittest.cc')
| -rw-r--r-- | ash/wm/workspace_controller_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc index 0438c83..df05ed6 100644 --- a/ash/wm/workspace_controller_unittest.cc +++ b/ash/wm/workspace_controller_unittest.cc @@ -703,7 +703,7 @@ TEST_F(WorkspaceControllerTest, TransientParent) { // Window with a transient parent. We set the transient parent to the root, // which would never happen but is enough to exercise the bug. scoped_ptr<Window> w1(CreateTestWindowUnparented()); - ::wm::AddTransientChild( + views::corewm::AddTransientChild( Shell::GetInstance()->GetPrimaryRootWindow(), w1.get()); w1->SetBounds(gfx::Rect(10, 11, 250, 251)); ParentWindowInPrimaryRootWindow(w1.get()); @@ -1159,7 +1159,7 @@ TEST_F(WorkspaceControllerTest, VerifyLayerOrdering) { ui::wm::WINDOW_TYPE_POPUP, gfx::Rect(5, 6, 7, 8), NULL); - ::wm::AddTransientChild(browser.get(), status_bubble); + views::corewm::AddTransientChild(browser.get(), status_bubble); ParentWindowInPrimaryRootWindow(status_bubble); status_bubble->SetName("status_bubble"); |