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

Unified Diff: ash/shelf/shelf_window_watcher_unittest.cc

Issue 1913473002: Makes WorkspaceWindowResizer use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@root_controller_observer
Patch Set: fix exo again Created 4 years, 8 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/ash.gyp ('k') | ash/wm/aura/wm_globals_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_window_watcher_unittest.cc
diff --git a/ash/shelf/shelf_window_watcher_unittest.cc b/ash/shelf/shelf_window_watcher_unittest.cc
index 1a818c6b5c2c3cf9883ea81596b7de0e3b8e5459..b169f1f77a8727e9fdda16a46a7845b23f299af3 100644
--- a/ash/shelf/shelf_window_watcher_unittest.cc
+++ b/ash/shelf/shelf_window_watcher_unittest.cc
@@ -12,6 +12,7 @@
#include "ash/shell_window_ids.h"
#include "ash/test/ash_test_base.h"
#include "ash/test/shell_test_api.h"
+#include "ash/wm/aura/wm_window_aura.h"
#include "ash/wm/window_resizer.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
@@ -226,8 +227,8 @@ TEST_F(ShelfWindowWatcherTest, DragWindow) {
// Simulate dragging of |window| and check its item is not changed.
std::unique_ptr<WindowResizer> resizer(
- CreateWindowResizer(window.get(), gfx::Point(), HTCAPTION,
- aura::client::WINDOW_MOVE_SOURCE_MOUSE));
+ CreateWindowResizer(wm::WmWindowAura::Get(window.get()), gfx::Point(),
+ HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE));
ASSERT_TRUE(resizer.get());
resizer->Drag(gfx::Point(50, 50), 0);
resizer->CompleteDrag();
@@ -265,8 +266,8 @@ TEST_F(ShelfWindowWatcherTest, ReparentWindowDuringTheDragging) {
// Simulate re-parenting to |new_parent| during the dragging.
{
std::unique_ptr<WindowResizer> resizer(
- CreateWindowResizer(window.get(), gfx::Point(), HTCAPTION,
- aura::client::WINDOW_MOVE_SOURCE_MOUSE));
+ CreateWindowResizer(wm::WmWindowAura::Get(window.get()), gfx::Point(),
+ HTCAPTION, aura::client::WINDOW_MOVE_SOURCE_MOUSE));
ASSERT_TRUE(resizer.get());
resizer->Drag(gfx::Point(50, 50), 0);
resizer->CompleteDrag();
« no previous file with comments | « ash/ash.gyp ('k') | ash/wm/aura/wm_globals_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698