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

Unified Diff: ash/wm/drag_window_resizer_unittest.cc

Issue 2739553005: Moves maintaining root_window_for_new_windows_ to Shell (Closed)
Patch Set: remove ash:: Created 3 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
« no previous file with comments | « ash/wm/ash_focus_rules.cc ('k') | chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/drag_window_resizer_unittest.cc
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
index c0514a7cea160c9a856ec0cb80ef37ea17417c84..410022bdffaf6bb29d1bcd7d19ad3874d83f419d 100644
--- a/ash/wm/drag_window_resizer_unittest.cc
+++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -306,10 +306,10 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
window->SetBoundsInScreen(gfx::Rect(0, 0, 50, 60),
display::Screen::GetScreen()->GetPrimaryDisplay());
window->Show();
- EXPECT_TRUE(ash::wm::CanActivateWindow(window.get()));
- ash::wm::ActivateWindow(window.get());
+ EXPECT_TRUE(wm::CanActivateWindow(window.get()));
+ wm::ActivateWindow(window.get());
EXPECT_EQ(root_windows[0], window->GetRootWindow());
- EXPECT_EQ(root_windows[0], ash::Shell::GetTargetRootWindow());
+ EXPECT_EQ(root_windows[0], Shell::GetRootWindowForNewWindows());
{
// Grab (0, 0) of the window.
std::unique_ptr<WindowResizer> resizer(
@@ -322,7 +322,7 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplaysActiveRoot) {
// The whole window is on the secondary display now. The parent should be
// changed.
EXPECT_EQ(root_windows[1], window->GetRootWindow());
- EXPECT_EQ(root_windows[1], ash::Shell::GetTargetRootWindow());
+ EXPECT_EQ(root_windows[1], Shell::GetRootWindowForNewWindows());
}
}
« no previous file with comments | « ash/wm/ash_focus_rules.cc ('k') | chrome/browser/chromeos/input_method/candidate_window_controller_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698