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

Unified Diff: ash/shell.h

Issue 723633003: Reland ScreenOrientationDelegate on ChromeOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ChromeOS build error Created 6 years, 1 month 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 dbc8598cb6def3ce960e64d1388a6f19e1c3ff62..028609705d7405ce3e6579a25f3444abdb95d0a9 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -118,6 +118,7 @@ class ResolutionNotificationController;
class RootWindowController;
class ScopedTargetRootWindow;
class ScreenAsh;
+class ScreenOrientationDelegate;
class ScreenPositionController;
class SessionStateDelegate;
class Shelf;
@@ -535,6 +536,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return logout_confirmation_controller_.get();
}
+ ScreenOrientationDelegate* screen_orientation_delegate() {
+ return screen_orientation_delegate_.get();
+ }
+
VirtualKeyboardController* virtual_keyboard_controller() {
return virtual_keyboard_controller_.get();
}
@@ -728,6 +733,9 @@ 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_;
+
scoped_ptr<TouchTransformerController> touch_transformer_controller_;
#if defined(USE_X11)
« 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