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

Unified Diff: ash/wm/workspace/workspace_event_handler.cc

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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
Index: ash/wm/workspace/workspace_event_handler.cc
diff --git a/ash/wm/workspace/workspace_event_handler.cc b/ash/wm/workspace/workspace_event_handler.cc
index 73d1a8cf650250dbd7b6c20caa6781a46643182b..615528649687b307381cb2afc8e6e4f3f1a2dec2 100644
--- a/ash/wm/workspace/workspace_event_handler.cc
+++ b/ash/wm/workspace/workspace_event_handler.cc
@@ -9,6 +9,7 @@
#include "ash/touch/touch_uma.h"
#include "ash/wm/common/wm_event.h"
#include "ash/wm/window_state.h"
+#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/hit_test.h"
@@ -110,7 +111,7 @@ void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) {
void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(
wm::WindowState* target_state,
ui::MouseEvent* event) {
- aura::Window* target = target_state->window();
+ aura::Window* target = target_state->aura_window();
if (event->flags() & ui::EF_IS_DOUBLE_CLICK) {
int component =
target->delegate()->GetNonClientComponent(event->location());
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller.cc ('k') | ash/wm/workspace/workspace_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698