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

Unified Diff: ash/shell.h

Issue 2217713002: Remove the system menu display settings row (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 3 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/resources/default_200_percent/cros/status/status_display_dark.png ('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 274936ebc122fb92ccb0eaad9e8c6072fc03e5c9..eae388f9178c11178ed1afe5e5d1920c39d651cd 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -124,6 +124,7 @@ class SystemTray;
class ToplevelWindowEventHandler;
class TouchTransformerController;
class TouchObserverHUD;
+class ScreenLayoutObserver;
class VirtualKeyboardController;
class VideoActivityNotifier;
class VideoDetector;
@@ -385,6 +386,10 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
return display_error_observer_.get();
}
+ ScreenLayoutObserver* screen_layout_observer() {
+ return screen_layout_observer_.get();
+ }
+
ResolutionNotificationController* resolution_notification_controller() {
return resolution_notification_controller_.get();
}
@@ -561,6 +566,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
// Implements content::ScreenOrientationController for ChromeOS
std::unique_ptr<ScreenOrientationController> screen_orientation_controller_;
+ std::unique_ptr<ScreenLayoutObserver> screen_layout_observer_;
std::unique_ptr<TouchTransformerController> touch_transformer_controller_;
« no previous file with comments | « ash/resources/default_200_percent/cros/status/status_display_dark.png ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698