ash/shell.h - Issue 298703007: Refactor and move ash independent nested accelerator code to ui/wm/core

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/shell.h

Issue 298703007: Refactor and move ash independent nested accelerator code to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: skip test if platform does not support PES Created 6 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 side-by-side diff with in-line comments

Download patch

Index: ash/shell.h

diff --git a/ash/shell.h b/ash/shell.h

index 371ea9fcc2ed17f84594f203934c1e0ce10d924a..fcc3736319d2e105d8d0dc6d77489edbf6dcd093 100644

--- a/ash/shell.h

+++ b/ash/shell.h

@@ -64,6 +64,7 @@ class TooltipController;

namespace wm {

class CompoundEventFilter;

class InputMethodEventFilter;

+class NestedAcceleratorController;

class ShadowController;

class VisibilityController;

class UserActivityDetector;

@@ -106,7 +107,6 @@ class MaximizeModeWindowManager;

class MediaDelegate;

class MouseCursorEventFilter;

class MruWindowTracker;

-class NestedDispatcherController;

class NewWindowDelegate;

class OverlayEventFilter;

class PartialMagnificationController;

@@ -631,7 +631,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,

std::vector<WindowAndBoundsPair> to_restore_;

scoped_ptr<UserMetricsRecorder> user_metrics_recorder_;

- scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;

+ scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_;

scoped_ptr<AcceleratorController> accelerator_controller_;

scoped_ptr<ShellDelegate> delegate_;

scoped_ptr<SystemTrayDelegate> system_tray_delegate_;

« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »