| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 9e6e046ccefe55dad3ac68dbff0b82e6b2bbf7b8..69e8835a2588bf5d3a27af337e4306ce75d476aa 100644
|
| --- a/ash/shell.h
|
| +++ b/ash/shell.h
|
| @@ -118,6 +118,7 @@ class ResolutionNotificationController;
|
| class RootWindowController;
|
| class ScopedTargetRootWindow;
|
| class ScreenAsh;
|
| +class ScreenOrientationDelegate;
|
| class ScreenPositionController;
|
| class SessionStateDelegate;
|
| class Shelf;
|
| @@ -537,6 +538,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| LogoutConfirmationController* logout_confirmation_controller() {
|
| return logout_confirmation_controller_.get();
|
| }
|
| +
|
| + ScreenOrientationDelegate* screen_orientation_delegate() {
|
| + return screen_orientation_delegate_.get();
|
| + }
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| ShelfModel* shelf_model() {
|
| @@ -729,6 +734,9 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| // Listens for output changes and updates the display manager.
|
| scoped_ptr<DisplayChangeObserver> display_change_observer_;
|
|
|
| + // Implements content::ScreenOrientationDelegate for ChromeOS
|
| + scoped_ptr<ScreenOrientationDelegate> screen_orientation_delegate_;
|
| +
|
| #if defined(USE_X11)
|
| scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
|
| scoped_ptr<ui::EventHandler> speech_feedback_handler_;
|
|
|