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

Unified Diff: ash/shell.cc

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/shell.h ('k') | ash/system/chromeos/screen_layout_observer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index c3c68f46ede85a84b390aafbcec8a1393cc56f51..4a83bc5a4e97aabed13f9c9ef7b14edae52c7c32 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -55,6 +55,7 @@
#include "ash/magnifier/partial_magnification_controller.h"
#include "ash/root_window_controller.h"
#include "ash/shell_init_params.h"
+#include "ash/system/chromeos/screen_layout_observer.h"
#include "ash/utility/screenshot_controller.h"
#include "ash/wallpaper/wallpaper_controller.h"
#include "ash/wallpaper/wallpaper_view.h"
@@ -549,6 +550,7 @@ Shell::~Shell() {
#if defined(OS_CHROMEOS)
screen_orientation_controller_.reset();
+ screen_layout_observer_.reset();
#endif
// Destroy the virtual keyboard controller before the maximize mode controller
@@ -944,6 +946,7 @@ void Shell::Init(const ShellInitParams& init_params) {
new VideoActivityNotifier(video_detector_.get()));
bluetooth_notification_controller_.reset(new BluetoothNotificationController);
screen_orientation_controller_.reset(new ScreenOrientationController());
+ screen_layout_observer_.reset(new ScreenLayoutObserver());
#endif
// The compositor thread and main message loop have to be running in
// order to create mirror window. Run it after the main message loop
« no previous file with comments | « ash/shell.h ('k') | ash/system/chromeos/screen_layout_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698