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

Unified Diff: ash/common/system/tray/system_tray.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/ash_chromeos_strings.grdp ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/system_tray.cc
diff --git a/ash/common/system/tray/system_tray.cc b/ash/common/system/tray/system_tray.cc
index 3dedf4069c7426171449b3de59ec2c74b5225f15..7b9612377bcb0065dae013ca36143aa7076b7117 100644
--- a/ash/common/system/tray/system_tray.cc
+++ b/ash/common/system/tray/system_tray.cc
@@ -195,12 +195,6 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
AddTrayItem(new TrayBluetooth(this));
tray_cast_ = new TrayCast(this);
AddTrayItem(tray_cast_);
- // TODO(jamescook): Remove this when mus has support for display management
- // and we have a DisplayManager equivalent. See http://crbug.com/548429
- std::unique_ptr<SystemTrayItem> tray_display =
- delegate->CreateDisplayTrayItem(this);
- if (tray_display)
- AddTrayItem(tray_display.release());
screen_capture_tray_item_ = new ScreenCaptureTrayItem(this);
AddTrayItem(screen_capture_tray_item_);
screen_share_tray_item_ = new ScreenShareTrayItem(this);
« no previous file with comments | « ash/ash_chromeos_strings.grdp ('k') | ash/common/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698