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

Unified Diff: ui/aura/test/test_windows.cc

Issue 11421006: Desktop aura: Break aura::Window::SetParent in two. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ash_unittests 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
« no previous file with comments | « ui/aura/test/test_windows.h ('k') | ui/aura/window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/test/test_windows.cc
diff --git a/ui/aura/test/test_windows.cc b/ui/aura/test/test_windows.cc
index 75cd53066056c5fbddb312be4d79751fbe99239e..f41a034d3319bb0728a234ff893b282530826325 100644
--- a/ui/aura/test/test_windows.cc
+++ b/ui/aura/test/test_windows.cc
@@ -52,21 +52,11 @@ Window* CreateTestWindowWithDelegateAndType(WindowDelegate* delegate,
window->Init(ui::LAYER_TEXTURED);
window->SetBounds(bounds);
window->Show();
- window->SetParent(parent);
+ parent->AddChild(window);
window->SetProperty(aura::client::kCanMaximizeKey, true);
return window;
}
-Window* CreateTransientChild(int id, Window* parent) {
- Window* window = new Window(NULL);
- window->set_id(id);
- window->SetType(aura::client::WINDOW_TYPE_NORMAL);
- window->Init(ui::LAYER_TEXTURED);
- window->SetParent(NULL);
- parent->AddTransientChild(window);
- return window;
-}
-
template <typename T>
bool ObjectIsAbove(T* upper, T* lower) {
DCHECK_EQ(upper->parent(), lower->parent());
« no previous file with comments | « ui/aura/test/test_windows.h ('k') | ui/aura/window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698