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

Unified Diff: ash/wm/toplevel_window_event_handler.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/wm/system_modal_container_layout_manager_unittest.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cfc8ebffc70ae4d1cfa6270e9281e755188411f0..fee1c1625b401330d55df0422a6ec401f2b8807c 100644
--- a/ash/wm/toplevel_window_event_handler.cc
+++ b/ash/wm/toplevel_window_event_handler.cc
@@ -4,8 +4,8 @@
#include "ash/wm/toplevel_window_event_handler.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/wm/window_state.h"
+#include "ash/common/wm_window.h"
#include "ash/shell.h"
#include "ash/wm/window_state_aura.h"
#include "base/message_loop/message_loop.h"
@@ -35,14 +35,13 @@ 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,
- WmWindowAura::Get(target));
+ wm_toplevel_window_event_handler_.OnMouseEvent(event, WmWindow::Get(target));
}
void ToplevelWindowEventHandler::OnGestureEvent(ui::GestureEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
wm_toplevel_window_event_handler_.OnGestureEvent(event,
- WmWindowAura::Get(target));
+ WmWindow::Get(target));
}
aura::client::WindowMoveResult ToplevelWindowEventHandler::RunMoveLoop(
@@ -78,7 +77,7 @@ aura::client::WindowMoveResult ToplevelWindowEventHandler::RunMoveLoop(
wm::WmToplevelWindowEventHandler::DragResult result =
wm::WmToplevelWindowEventHandler::DragResult::SUCCESS;
if (!wm_toplevel_window_event_handler_.AttemptToStartDrag(
- WmWindowAura::Get(source), drag_location, HTCAPTION, move_source,
+ WmWindow::Get(source), drag_location, HTCAPTION, move_source,
base::Bind(&ToplevelWindowEventHandler::OnDragCompleted,
weak_factory_.GetWeakPtr(), &result, &run_loop))) {
return aura::client::MOVE_CANCELED;
« no previous file with comments | « ash/wm/system_modal_container_layout_manager_unittest.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698