summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h
index 354d653..e889131 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -64,7 +64,6 @@ class TooltipController;
namespace wm {
class CompoundEventFilter;
class InputMethodEventFilter;
-class NestedAcceleratorController;
class ShadowController;
class VisibilityController;
class UserActivityDetector;
@@ -107,6 +106,7 @@ class MaximizeModeWindowManager;
class MediaDelegate;
class MouseCursorEventFilter;
class MruWindowTracker;
+class NestedDispatcherController;
class NewWindowDelegate;
class OverlayEventFilter;
class PartialMagnificationController;
@@ -623,7 +623,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
std::vector<WindowAndBoundsPair> to_restore_;
scoped_ptr<UserMetricsRecorder> user_metrics_recorder_;
- scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_;
+ scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_;
scoped_ptr<AcceleratorController> accelerator_controller_;
scoped_ptr<ShellDelegate> delegate_;
scoped_ptr<SystemTrayDelegate> system_tray_delegate_;