Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

Issue 196063002: Move wm/core to wm namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 7f55945ad16c6e4326398bc737fb97ebd1b0c384..e59c2ce3c2c6dae477122ba8d523ee52f6f076b6 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -520,15 +520,15 @@ TEST_F(MultiUserWindowManagerChromeOSTest, TransientWindows) {
// 3 - ..
multi_user_window_manager()->SetWindowOwner(window(0), "A");
multi_user_window_manager()->SetWindowOwner(window(4), "B");
- views::corewm::AddTransientChild(window(0), window(1));
+ ::wm::AddTransientChild(window(0), window(1));
// We first attach 2->3 and then 1->2 to see that the ownership gets
// properly propagated through the sub tree upon assigning.
- views::corewm::AddTransientChild(window(2), window(3));
- views::corewm::AddTransientChild(window(1), window(2));
- views::corewm::AddTransientChild(window(4), window(5));
- views::corewm::AddTransientChild(window(4), window(6));
- views::corewm::AddTransientChild(window(7), window(8));
- views::corewm::AddTransientChild(window(7), window(9));
+ ::wm::AddTransientChild(window(2), window(3));
+ ::wm::AddTransientChild(window(1), window(2));
+ ::wm::AddTransientChild(window(4), window(5));
+ ::wm::AddTransientChild(window(4), window(6));
+ ::wm::AddTransientChild(window(7), window(8));
+ ::wm::AddTransientChild(window(7), window(9));
// By now the hierarchy should have updated itself to show all windows of A
// and hide all windows of B. Unowned windows should remain in what ever state
@@ -565,15 +565,15 @@ TEST_F(MultiUserWindowManagerChromeOSTest, TransientWindows) {
// 1 5 8
// |
// 9
- views::corewm::RemoveTransientChild(window(2), window(3));
- views::corewm::RemoveTransientChild(window(4), window(6));
+ ::wm::RemoveTransientChild(window(2), window(3));
+ ::wm::RemoveTransientChild(window(4), window(6));
EXPECT_EQ("S[A], S[], H[], H[], H[B], H[], S[], S[], S[], H[]", GetStatus());
// Before we leave we need to reverse all transient window ownerships.
- views::corewm::RemoveTransientChild(window(0), window(1));
- views::corewm::RemoveTransientChild(window(1), window(2));
- views::corewm::RemoveTransientChild(window(4), window(5));
- views::corewm::RemoveTransientChild(window(7), window(8));
- views::corewm::RemoveTransientChild(window(7), window(9));
+ ::wm::RemoveTransientChild(window(0), window(1));
+ ::wm::RemoveTransientChild(window(1), window(2));
+ ::wm::RemoveTransientChild(window(4), window(5));
+ ::wm::RemoveTransientChild(window(7), window(8));
+ ::wm::RemoveTransientChild(window(7), window(9));
}
// Test that the initial visibility state gets remembered.

Powered by Google App Engine
This is Rietveld 408576698