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 028609705d7405ce3e6579a25f3444abdb95d0a9..639f0e377be31115745ab3facc1c1672274ec18d 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -118,7 +118,7 @@ class ResolutionNotificationController;
 class RootWindowController;
 class ScopedTargetRootWindow;
 class ScreenAsh;
-class ScreenOrientationDelegate;
+class ScreenOrientationController;
 class ScreenPositionController;
 class SessionStateDelegate;
 class Shelf;
@@ -536,8 +536,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() {
@@ -733,8 +733,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_;