trunk/src/ash/accelerators/accelerator_dispatcher.cc - Issue 300093002: Revert 272740 "Refactor and move ash independent accelerator han..."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: trunk/src/ash/accelerators/accelerator_dispatcher.cc

Issue 300093002: Revert 272740 "Refactor and move ash independent accelerator han..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « trunk/src/ash/accelerators/accelerator_dispatcher.h ('k') | trunk/src/ash/accelerators/accelerator_dispatcher_linux.cc » ('j') | no next file with comments »

OLD	NEW
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/accelerators/accelerator_dispatcher.h"	5 #include "ash/accelerators/accelerator_dispatcher.h"

6	6

7 #include "ash/accelerators/accelerator_controller.h"	7 #include "ash/accelerators/accelerator_controller.h"

8 #include "ash/shell.h"	8 #include "ash/shell.h"

9 #include "ui/aura/window_event_dispatcher.h"	9 #include "ui/aura/window_event_dispatcher.h"

10 #include "ui/base/accelerators/accelerator.h"	10 #include "ui/base/accelerators/accelerator.h"

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 if (key_event.type() == ui::ET_KEY_RELEASED)	61 if (key_event.type() == ui::ET_KEY_RELEASED)

62 accelerator.set_type(ui::ET_KEY_RELEASED);	62 accelerator.set_type(ui::ET_KEY_RELEASED);

63 // Fill out context object so AcceleratorController will know what	63 // Fill out context object so AcceleratorController will know what

64 // was the previous accelerator or if the current accelerator is repeated.	64 // was the previous accelerator or if the current accelerator is repeated.

65 Shell::GetInstance()->accelerator_controller()->context()->UpdateContext(	65 Shell::GetInstance()->accelerator_controller()->context()->UpdateContext(

66 accelerator);	66 accelerator);

67 return accelerator_controller->Process(accelerator);	67 return accelerator_controller->Process(accelerator);

68 }	68 }

69	69

70 } // namespace ash	70 } // namespace ash

OLD	NEW