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

Unified Diff: ash/root_window_controller_unittest.cc

Issue 11421006: Desktop aura: Break aura::Window::SetParent in two. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Further renames for oshima Created 8 years, 1 month 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: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index c58638a9ff43fdecec52e902052d88e1ddaf6ca2..64531f92aca7336ce28a9604132375a57ab781ca 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -147,8 +147,8 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
// will not crash.
aura::WindowTracker tracker;
DeleteOnBlurDelegate delete_on_blur_delegate;
- aura::Window* d2 = aura::test::CreateTestWindowWithDelegate(
- &delete_on_blur_delegate, 0, gfx::Rect(50, 50, 100, 100), NULL);
+ aura::Window* d2 = CreateTestWindowInShellWithDelegate(
+ &delete_on_blur_delegate, 0, gfx::Rect(50, 50, 100, 100));
delete_on_blur_delegate.set_window(d2);
root_windows[0]->GetFocusManager()->SetFocusedWindow(
d2, NULL);
« no previous file with comments | « ash/focus_cycler_unittest.cc ('k') | ash/shell_unittest.cc » ('j') | ash/test/ash_test_base.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698