ash/wm/workspace/workspace_event_filter.cc - Issue 10827145: Convert Aura to use ui::Event.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10827145: Convert Aura to use ui::Event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 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:

Index: ash/wm/workspace/workspace_event_filter.cc

===================================================================

--- ash/wm/workspace/workspace_event_filter.cc (revision 150582)

+++ ash/wm/workspace/workspace_event_filter.cc (working copy)

@@ -11,9 +11,9 @@

#include "ash/wm/workspace/workspace_layout_manager.h"

#include "ash/wm/workspace/workspace_window_resizer.h"

#include "ui/aura/client/aura_constants.h"

-#include "ui/aura/event.h"

#include "ui/aura/window.h"

#include "ui/aura/window_delegate.h"

+#include "ui/base/event.h"

#include "ui/base/hit_test.h"

#include "ui/compositor/scoped_layer_animation_settings.h"

#include "ui/gfx/screen.h"

@@ -78,7 +78,7 @@

}

bool WorkspaceEventFilter::PreHandleMouseEvent(aura::Window* target,

- aura::MouseEvent* event) {

+ ui::MouseEvent* event) {

switch (event->type()) {

case ui::ET_MOUSE_MOVED: {

int component =

@@ -145,7 +145,7 @@

void WorkspaceEventFilter::HandleVerticalResizeDoubleClick(

aura::Window* target,

- aura::MouseEvent* event) {

+ ui::MouseEvent* event) {

if (event->flags() & ui::EF_IS_DOUBLE_CLICK &&

!wm::IsWindowMaximized(target)) {

int component =