ui/aura_shell/shell.cc - Issue 8602003: Revert 110637 - Add ShellAcceleratorController that manages global keyboard accelerators.

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/aura_shell/shell.cc

Issue 8602003: Revert 110637 - Add ShellAcceleratorController that manages global keyboard accelerators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 1 month 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

Index: ui/aura_shell/shell.cc

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

--- ui/aura_shell/shell.cc (revision 110642)

+++ ui/aura_shell/shell.cc (working copy)

@@ -20,7 +20,6 @@

#include "ui/aura_shell/launcher/launcher.h"

#include "ui/aura_shell/modal_container_layout_manager.h"

#include "ui/aura_shell/shelf_layout_controller.h"

-#include "ui/aura_shell/shell_accelerator_controller.h"

#include "ui/aura_shell/shell_delegate.h"

#include "ui/aura_shell/shell_factory.h"

#include "ui/aura_shell/shell_window_ids.h"

@@ -99,7 +98,6 @@

Shell::Shell(ShellDelegate* delegate)

: ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)),

- accelerator_controller_(new ShellAcceleratorController),

delegate_(delegate) {

aura::Desktop::GetInstance()->SetEventFilter(

new internal::DesktopEventFilter);

« no previous file with comments | « ui/aura_shell/shell.h ('k') | ui/aura_shell/shell_accelerator_controller.h » ('j') | no next file with comments »