ui/views/focus/accelerator_handler.h - Issue 9958152: Consolidate win/x dispatchers

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: ui/views/focus/accelerator_handler.h

Issue 9958152: Consolidate win/x dispatchers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync, addressed comments Created 8 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:

Index: ui/views/focus/accelerator_handler.h

diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h

index 7f5cab1489a4ebe1409eb1e7c2a278717ed4a09f..a79fc02dbe41f2041e2c449692f0fc72ea09449e 100644

--- a/ui/views/focus/accelerator_handler.h

+++ b/ui/views/focus/accelerator_handler.h

@@ -35,13 +35,10 @@ class VIEWS_EXPORT AcceleratorHandler : public MessageLoop::Dispatcher {

// Dispatcher method. This returns true if an accelerator was processed by the

// focus manager

-#if defined(OS_WIN)

- virtual bool Dispatch(const MSG& msg) OVERRIDE;

+#if defined(OS_WIN) || defined(USE_AURA)

+ virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;

#elif defined(OS_MACOSX)

// TODO(dhollowa): Implement on Mac. http://crbug.com/109946

-#elif defined(USE_AURA)

- virtual base::MessagePumpDispatcher::DispatchStatus Dispatch(

- XEvent* xev) OVERRIDE;

#endif

private: