Index: ash/shell.h |
diff --git a/ash/shell.h b/ash/shell.h |
index c9f4eb0fe3a55afadc1e68e4cd24e133ec0e95d6..e9dd6ecbe98e8ce5e8f795698d7fb29cc837c482 100644 |
--- a/ash/shell.h |
+++ b/ash/shell.h |
@@ -123,7 +123,7 @@ class ResolutionNotificationController; |
class RootWindowController; |
class ScopedTargetRootWindow; |
class ScreenAsh; |
-class ScreenOrientationDelegate; |
+class ScreenOrientationController; |
class ScreenPositionController; |
class SessionStateDelegate; |
class Shelf; |
@@ -540,8 +540,8 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, |
return logout_confirmation_controller_.get(); |
} |
- ScreenOrientationDelegate* screen_orientation_delegate() { |
- return screen_orientation_delegate_.get(); |
+ ScreenOrientationController* screen_orientation_controller() { |
+ return screen_orientation_controller_.get(); |
} |
VirtualKeyboardController* virtual_keyboard_controller() { |
@@ -736,8 +736,8 @@ 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_; |
+ // Implements content::ScreenOrientationController for ChromeOS |
+ scoped_ptr<ScreenOrientationController> screen_orientation_controller_; |
scoped_ptr<TouchTransformerController> touch_transformer_controller_; |