Move Screen Rotation from MaximizeModeController to ScreenOrientationController

ash/shell.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELL_H_
 #define ASH_SHELL_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 100 matching lines @@
 class OverlayEventFilter;
 class PartialMagnificationController;
 class PowerButtonController;
 class PowerEventObserver;
 class ProjectingObserver;
 class ResizeShadowController;
 class ResolutionNotificationController;
 class RootWindowController;
 class ScopedTargetRootWindow;
 class ScreenAsh;
-class ScreenOrientationDelegate;
+class ScreenOrientationController;
 class ScreenPositionController;
 class SessionStateDelegate;
 class Shelf;
 class ShelfDelegate;
 class ShelfItemDelegateManager;
 class ShelfModel;
 class ShelfWindowWatcher;
 class ShellDelegate;
 struct ShellInitParams;
 class ShellObserver;
@@ skipping 397 matching lines @@
   }
 
   ResolutionNotificationController* resolution_notification_controller() {
     return resolution_notification_controller_.get();
   }
 
   LogoutConfirmationController* logout_confirmation_controller() {
     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() {
     return virtual_keyboard_controller_.get();
   }
 #endif  // defined(OS_CHROMEOS)
 
   ShelfModel* shelf_model() {
     return shelf_model_.get();
   }
@@ skipping 175 matching lines @@
   scoped_ptr<VirtualKeyboardController> virtual_keyboard_controller_;
   // Controls video output device state.
   scoped_ptr<ui::DisplayConfigurator> display_configurator_;
   scoped_ptr<DisplayConfiguratorAnimation> display_configurator_animation_;
   scoped_ptr<DisplayErrorObserver> display_error_observer_;
   scoped_ptr<ProjectingObserver> projecting_observer_;
 
   // 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_;
 
 #if defined(USE_X11)
   scoped_ptr<ui::EventHandler> magnifier_key_scroll_handler_;
   scoped_ptr<ui::EventHandler> speech_feedback_handler_;
 #endif  // defined(USE_X11)
 #endif  // defined(OS_CHROMEOS)
 
   scoped_ptr<MaximizeModeController> maximize_mode_controller_;
@@ skipping 19 matching lines @@
 
   // Injected content::GPUDataManager support.
   scoped_ptr<GPUSupport> gpu_support_;
 
   DISALLOW_COPY_AND_ASSIGN(Shell);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELL_H_