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

Unified Diff: ash/wm/toplevel_window_event_handler.cc

Issue 2905893002: chromeos: convert more ash/wm code to aura::Window (Closed)
Patch Set: moar cleanup Created 3 years, 7 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/toplevel_window_event_handler.cc
diff --git a/ash/wm/toplevel_window_event_handler.cc b/ash/wm/toplevel_window_event_handler.cc
index bf04195d602965a34a3ec1cfd1c1bb9cb9683f14..e8399ee8faec9c4279d056ef1ef544b1cc992e42 100644
--- a/ash/wm/toplevel_window_event_handler.cc
+++ b/ash/wm/toplevel_window_event_handler.cc
@@ -6,7 +6,6 @@
#include "ash/shell.h"
#include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "ui/aura/client/cursor_client.h"
@@ -34,13 +33,12 @@ void ToplevelWindowEventHandler::OnKeyEvent(ui::KeyEvent* event) {
void ToplevelWindowEventHandler::OnMouseEvent(ui::MouseEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
- wm_toplevel_window_event_handler_.OnMouseEvent(event, WmWindow::Get(target));
+ wm_toplevel_window_event_handler_.OnMouseEvent(event, target);
}
void ToplevelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
- wm_toplevel_window_event_handler_.OnGestureEvent(event,
- WmWindow::Get(target));
+ wm_toplevel_window_event_handler_.OnGestureEvent(event, target);
}
aura::client::WindowMoveResult ToplevelWindowEventHandler::RunMoveLoop(
@@ -76,7 +74,7 @@ aura::client::WindowMoveResult ToplevelWindowEventHandler::RunMoveLoop(
wm::WmToplevelWindowEventHandler::DragResult result =
wm::WmToplevelWindowEventHandler::DragResult::SUCCESS;
if (!wm_toplevel_window_event_handler_.AttemptToStartDrag(
- WmWindow::Get(source), drag_location, HTCAPTION, move_source,
+ source, drag_location, HTCAPTION, move_source,
base::Bind(&ToplevelWindowEventHandler::OnDragCompleted,
weak_factory_.GetWeakPtr(), &result, &run_loop))) {
return aura::client::MOVE_CANCELED;

Powered by Google App Engine
This is Rietveld 408576698