| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index c71e0030c4a08dc3688da601c4432110d89ac8dc..ab19a5a19650e6787a9e78a9230836aeb4900a19 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -111,6 +111,7 @@ class MediaDelegate;
|
| class MouseCursorEventFilter;
|
| class MruWindowTracker;
|
| class NewWindowDelegate;
|
| +class OpenWithMenuController;
|
| class OverlayEventFilter;
|
| class PartialMagnificationController;
|
| class PartialScreenshotController;
|
| @@ -360,6 +361,9 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| DesktopBackgroundController* desktop_background_controller() {
|
| return desktop_background_controller_.get();
|
| }
|
| + OpenWithMenuController* open_with_menu_controller() {
|
| + return open_with_menu_controller_.get();
|
| + }
|
| PowerButtonController* power_button_controller() {
|
| return power_button_controller_.get();
|
| }
|
| @@ -675,6 +679,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| scoped_ptr< ::wm::WindowModalityController> window_modality_controller_;
|
| scoped_ptr<views::corewm::TooltipController> tooltip_controller_;
|
| scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
|
| + scoped_ptr<OpenWithMenuController> open_with_menu_controller_;
|
| scoped_ptr<PowerButtonController> power_button_controller_;
|
| scoped_ptr<LockStateController> lock_state_controller_;
|
| scoped_ptr<MruWindowTracker> mru_window_tracker_;
|
|
|