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

Side by Side Diff: ash/wm/workspace/workspace_event_handler.cc

Issue 2891183002: chromeos: removes WmWindow usage from MultiWindowResizeController (Closed)
Patch Set: feedback and merge 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 unified diff | Download patch
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/workspace/workspace_event_handler.h" 5 #include "ash/wm/workspace/workspace_event_handler.h"
6 6
7 #include "ash/shell_port.h" 7 #include "ash/shell_port.h"
8 #include "ash/wm/window_state.h" 8 #include "ash/wm/window_state.h"
9 #include "ash/wm/wm_event.h" 9 #include "ash/wm/wm_event.h"
10 #include "ash/wm_window.h" 10 #include "ash/wm_window.h"
(...skipping 13 matching lines...) Expand all
24 0)) { 24 0)) {
25 click_component_ = target->GetNonClientComponent(event->location()); 25 click_component_ = target->GetNonClientComponent(event->location());
26 } 26 }
27 27
28 if (event->handled()) 28 if (event->handled())
29 return; 29 return;
30 30
31 switch (event->type()) { 31 switch (event->type()) {
32 case ui::ET_MOUSE_MOVED: { 32 case ui::ET_MOUSE_MOVED: {
33 int component = target->GetNonClientComponent(event->location()); 33 int component = target->GetNonClientComponent(event->location());
34 multi_window_resize_controller_.Show(target, component, 34 multi_window_resize_controller_.Show(target->aura_window(), component,
35 event->location()); 35 event->location());
36 break; 36 break;
37 } 37 }
38 case ui::ET_MOUSE_ENTERED: 38 case ui::ET_MOUSE_ENTERED:
39 break; 39 break;
40 case ui::ET_MOUSE_CAPTURE_CHANGED: 40 case ui::ET_MOUSE_CAPTURE_CHANGED:
41 case ui::ET_MOUSE_EXITED: 41 case ui::ET_MOUSE_EXITED:
42 break; 42 break;
43 case ui::ET_MOUSE_PRESSED: { 43 case ui::ET_MOUSE_PRESSED: {
44 wm::WindowState* target_state = target->GetWindowState(); 44 wm::WindowState* target_state = target->GetWindowState();
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 ShellPort::Get()->RecordUserMetricsAction( 110 ShellPort::Get()->RecordUserMetricsAction(
111 UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK); 111 UMA_TOGGLE_SINGLE_AXIS_MAXIMIZE_BORDER_CLICK);
112 const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE); 112 const wm::WMEvent wm_event(wm::WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE);
113 target_state->OnWMEvent(&wm_event); 113 target_state->OnWMEvent(&wm_event);
114 event->StopPropagation(); 114 event->StopPropagation();
115 } 115 }
116 } 116 }
117 } 117 }
118 118
119 } // namespace ash 119 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/multi_window_resize_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698