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

Unified Diff: ash/drag_drop/drag_drop_tracker_unittest.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 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
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »
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 b47a2a81dc0d5580eb86ac951e91c7fe3186cddd..9e4cf69b48ba6723393e0a0bd689a04edfd2cb30 100644
--- a/ash/drag_drop/drag_drop_tracker_unittest.cc
+++ b/ash/drag_drop/drag_drop_tracker_unittest.cc
@@ -6,9 +6,9 @@
#include <memory>
-#include "ash/aura/wm_window_aura.h"
#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"
#include "ash/test/ash_test_base.h"
@@ -70,7 +70,7 @@ TEST_F(DragDropTrackerTest, GetTarget) {
EXPECT_EQ("300,100 100x100", window1->GetBoundsInScreen().ToString());
// RootWindow0 is active so the capture window is parented to it.
- EXPECT_EQ(WmWindowAura::Get(root_windows[0]),
+ EXPECT_EQ(WmWindow::Get(root_windows[0]),
WmShell::Get()->GetRootWindowForNewWindows());
// Start tracking from the RootWindow1 and check the point on RootWindow0 that
@@ -93,7 +93,7 @@ TEST_F(DragDropTrackerTest, GetTarget) {
// Make RootWindow1 active so that capture window is parented to it.
ScopedRootWindowForNewWindows root_for_new_windows(
- WmWindowAura::Get(root_windows[1]));
+ WmWindow::Get(root_windows[1]));
// Start tracking from the RootWindow1 and check the point on RootWindow0 that
// |window0| covers.
@@ -131,7 +131,7 @@ TEST_F(DragDropTrackerTest, ConvertEvent) {
window1->Show();
// RootWindow0 is active so the capture window is parented to it.
- EXPECT_EQ(WmWindowAura::Get(root_windows[0]),
+ EXPECT_EQ(WmWindow::Get(root_windows[0]),
WmShell::Get()->GetRootWindowForNewWindows());
// Start tracking from the RootWindow0 and converts the mouse event into
@@ -160,7 +160,7 @@ TEST_F(DragDropTrackerTest, ConvertEvent) {
// Make RootWindow1 active so that capture window is parented to it.
ScopedRootWindowForNewWindows root_for_new_windows(
- WmWindowAura::Get(root_windows[1]));
+ WmWindow::Get(root_windows[1]));
// Start tracking from the RootWindow1 and converts the mouse event into
// |window0|'s coodinates.
« no previous file with comments | « ash/drag_drop/drag_drop_tracker.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698