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

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: fix MRUWindowTracker and MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest Created 7 years 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 dbf114e0d0eda9a8cc21cfae7e001ceb0a516bd2..b6f7c883bda4634e806c0127113bee5d12014ec0 100644
--- a/ash/wm/workspace_controller_unittest.cc
+++ b/ash/wm/workspace_controller_unittest.cc
@@ -31,6 +31,7 @@
#include "ui/compositor/layer.h"
#include "ui/compositor/scoped_animation_duration_scale_mode.h"
#include "ui/gfx/screen.h"
+#include "ui/views/corewm/transient_window_manager.h"
#include "ui/views/corewm/window_animations.h"
#include "ui/views/widget/widget.h"
@@ -676,7 +677,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();
@@ -1136,7 +1138,7 @@ TEST_F(WorkspaceControllerTest, VerifyLayerOrdering) {
aura::client::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");

Powered by Google App Engine
This is Rietveld 408576698