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

Unified Diff: ash/wm/workspace_controller_unittest.cc

Issue 115453004: Moves management of transients out of Window (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove unneeded parens Created 6 years, 11 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: ash/wm/workspace_controller_unittest.cc
diff --git a/ash/wm/workspace_controller_unittest.cc b/ash/wm/workspace_controller_unittest.cc
index 4b5fd92675f4f21cff2c13341112719aff87914e..e25a3d39b23012ea16faefe0f2ad97d2db0e1718 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -33,6 +33,7 @@
#include "ui/events/event_utils.h"
#include "ui/gfx/screen.h"
#include "ui/views/corewm/window_animations.h"
+#include "ui/views/corewm/window_util.h"
#include "ui/views/widget/widget.h"
using aura::Window;
@@ -677,7 +678,8 @@ 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());
- Shell::GetInstance()->GetPrimaryRootWindow()->AddTransientChild(w1.get());
+ views::corewm::AddTransientChild(
+ Shell::GetInstance()->GetPrimaryRootWindow(), w1.get());
w1->SetBounds(gfx::Rect(10, 11, 250, 251));
ParentWindowInPrimaryRootWindow(w1.get());
w1->Show();
@@ -1132,7 +1134,7 @@ TEST_F(WorkspaceControllerTest, VerifyLayerOrdering) {
ui::wm::WINDOW_TYPE_POPUP,
gfx::Rect(5, 6, 7, 8),
NULL);
- browser->AddTransientChild(status_bubble);
+ views::corewm::AddTransientChild(browser.get(), status_bubble);
ParentWindowInPrimaryRootWindow(status_bubble);
status_bubble->SetName("status_bubble");
« no previous file with comments | « ash/wm/workspace/workspace_window_resizer.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698