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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/drag_drop/drag_drop_tracker_unittest.cc

Issue 2739553005: Moves maintaining root_window_for_new_windows_ to Shell (Closed)
Patch Set: cleanup 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/common/wm_shell.cc ('k') | ash/mus/accelerators/accelerator_controller_registrar.cc » ('j') | ash/shell.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_tracker_unittest.cc
diff --git a/ash/drag_drop/drag_drop_tracker_unittest.cc b/ash/drag_drop/drag_drop_tracker_unittest.cc
index 3694b06208d43dce048c0e4a1b5a3742c4fc0902..500d2fed4cf9da343da7c4dee3d656a358f55dfd 100644
--- a/ash/drag_drop/drag_drop_tracker_unittest.cc
+++ b/ash/drag_drop/drag_drop_tracker_unittest.cc
@@ -7,7 +7,6 @@
#include <memory>
#include "ash/common/scoped_root_window_for_new_windows.h"
-#include "ash/common/wm_shell.h"
#include "ash/common/wm_window.h"
#include "ash/public/cpp/shell_window_ids.h"
#include "ash/shell.h"
@@ -68,7 +67,7 @@ TEST_F(DragDropTrackerTest, GetTarget) {
// RootWindow0 is active so the capture window is parented to it.
EXPECT_EQ(WmWindow::Get(root_windows[0]),
- WmShell::Get()->GetRootWindowForNewWindows());
+ Shell::GetInstance()->GetRootWindowForNewWindows());
// Start tracking from the RootWindow1 and check the point on RootWindow0 that
// |window0| covers.
@@ -126,7 +125,7 @@ TEST_F(DragDropTrackerTest, ConvertEvent) {
// RootWindow0 is active so the capture window is parented to it.
EXPECT_EQ(WmWindow::Get(root_windows[0]),
- WmShell::Get()->GetRootWindowForNewWindows());
+ Shell::GetInstance()->GetRootWindowForNewWindows());
// Start tracking from the RootWindow0 and converts the mouse event into
// |window0|'s coodinates.
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/mus/accelerators/accelerator_controller_registrar.cc » ('j') | ash/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698