| Index: ash/shell.h
|
| diff --git a/ash/shell.h b/ash/shell.h
|
| index 6f17e05c71878cf3c7d7a8d8aa7ac31ec1eeb392..660deb7313684ede11ca50d3ff114a2215855862 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;
|
| @@ -538,6 +539,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
|
| return logout_confirmation_controller_.get();
|
| }
|
|
|
| + ScreenOrientationDelegate* screen_orientation_delegate() {
|
| + return screen_orientation_delegate_.get();
|
| + }
|
| +
|
| VirtualKeyboardController* virtual_keyboard_controller() {
|
| return virtual_keyboard_controller_.get();
|
| }
|
| @@ -733,6 +738,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_;
|
| +
|
| scoped_ptr<TouchTransformerController> touch_transformer_controller_;
|
|
|
| #if defined(USE_X11)
|
|
|