| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 74d0f125ee2250c829762f8ae26f5a41b4ec6317..a738541bbbc9e73eeddf4cc080d5e2c467adf9eb 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;
|
| @@ -359,6 +360,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();
|
| }
|
| @@ -670,6 +674,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_;
|
|
|