Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: ash/shell.h

Issue 759063002: Move Screen Rotation from MaximizeModeController to ScreenOrientationController (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Linux Compile Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/content/display/screen_orientation_delegate_chromeos_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « ash/content/display/screen_orientation_delegate_chromeos_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698