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

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: Created 4 years, 4 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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index e117dbda8d15cbe97fb5dbe216f70130e956c5a1..9e9bf1b62056a55e7969162ba9cde60c8942433f 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -57,6 +57,7 @@
#include "ash/shelf/shelf.h"
#include "ash/shelf/shelf_widget.h"
#include "ash/shell_init_params.h"
+#include "ash/system/chromeos/screen_layout_observer.h"
#include "ash/utility/screenshot_controller.h"
#include "ash/wm/ash_focus_rules.h"
#include "ash/wm/ash_native_cursor_manager.h"
@@ -588,6 +589,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
@@ -981,6 +983,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

Powered by Google App Engine
This is Rietveld 408576698