Move Screen Rotation from MaximizeModeController to ScreenOrientationController

ash/shell.h

Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 9850afefb4298bcdf6af07a2e38fd316907c5768..cb29d448cc6bb149998b2158121bc38e4ca65a89 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;
@@ -541,8 +541,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() {
@@ -737,8 +737,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_;