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

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

Issue 1921883002: Removes WindowState::aura_window() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix windows build 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/wm/window_state.cc ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 615528649687b307381cb2afc8e6e4f3f1a2dec2..e6f98e1b336a69fff8e7b927d79af0773adc0289 100644
--- a/ash/wm/workspace/workspace_event_handler.cc
+++ b/ash/wm/workspace/workspace_event_handler.cc
@@ -8,6 +8,7 @@
#include "ash/shell.h"
#include "ash/touch/touch_uma.h"
#include "ash/wm/common/wm_event.h"
+#include "ash/wm/common/wm_window.h"
#include "ash/wm/window_state.h"
#include "ash/wm/window_state_aura.h"
#include "ui/aura/window.h"
@@ -111,10 +112,9 @@ void WorkspaceEventHandler::OnGestureEvent(ui::GestureEvent* event) {
void WorkspaceEventHandler::HandleVerticalResizeDoubleClick(
wm::WindowState* target_state,
ui::MouseEvent* event) {
- aura::Window* target = target_state->aura_window();
+ wm::WmWindow* target = target_state->window();
if (event->flags() & ui::EF_IS_DOUBLE_CLICK) {
- int component =
- target->delegate()->GetNonClientComponent(event->location());
+ int component = target->GetNonClientComponent(event->location());
if (component == HTBOTTOM || component == HTTOP) {
Shell::GetInstance()->metrics()->RecordUserMetricsAction(
UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK);
« no previous file with comments | « ash/wm/window_state.cc ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698