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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/common/system/tray/system_tray.h" 5 #include "ash/common/system/tray/system_tray.h"
6 6
7 #include "ash/common/ash_switches.h" 7 #include "ash/common/ash_switches.h"
8 #include "ash/common/login_status.h" 8 #include "ash/common/login_status.h"
9 #include "ash/common/session/session_state_delegate.h" 9 #include "ash/common/session/session_state_delegate.h"
10 #include "ash/common/shelf/wm_shelf.h" 10 #include "ash/common/shelf/wm_shelf.h"
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 AddTrayItem(new TrayIME(this)); 188 AddTrayItem(new TrayIME(this));
189 AddTrayItem(tray_accessibility_); 189 AddTrayItem(tray_accessibility_);
190 AddTrayItem(new TrayTracing(this)); 190 AddTrayItem(new TrayTracing(this));
191 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get())); 191 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get()));
192 AddTrayItem(new TrayNetwork(this)); 192 AddTrayItem(new TrayNetwork(this));
193 AddTrayItem(new TrayVPN(this)); 193 AddTrayItem(new TrayVPN(this));
194 AddTrayItem(new TraySms(this)); 194 AddTrayItem(new TraySms(this));
195 AddTrayItem(new TrayBluetooth(this)); 195 AddTrayItem(new TrayBluetooth(this));
196 tray_cast_ = new TrayCast(this); 196 tray_cast_ = new TrayCast(this);
197 AddTrayItem(tray_cast_); 197 AddTrayItem(tray_cast_);
198 // TODO(jamescook): Remove this when mus has support for display management
199 // and we have a DisplayManager equivalent. See http://crbug.com/548429
200 std::unique_ptr<SystemTrayItem> tray_display =
201 delegate->CreateDisplayTrayItem(this);
202 if (tray_display)
203 AddTrayItem(tray_display.release());
204 screen_capture_tray_item_ = new ScreenCaptureTrayItem(this); 198 screen_capture_tray_item_ = new ScreenCaptureTrayItem(this);
205 AddTrayItem(screen_capture_tray_item_); 199 AddTrayItem(screen_capture_tray_item_);
206 screen_share_tray_item_ = new ScreenShareTrayItem(this); 200 screen_share_tray_item_ = new ScreenShareTrayItem(this);
207 AddTrayItem(screen_share_tray_item_); 201 AddTrayItem(screen_share_tray_item_);
208 AddTrayItem(new MultiProfileMediaTrayItem(this)); 202 AddTrayItem(new MultiProfileMediaTrayItem(this));
209 tray_audio_ = new TrayAudioChromeOs(this); 203 tray_audio_ = new TrayAudioChromeOs(this);
210 AddTrayItem(tray_audio_); 204 AddTrayItem(tray_audio_);
211 AddTrayItem(new TrayBrightness(this)); 205 AddTrayItem(new TrayBrightness(this));
212 AddTrayItem(new TrayCapsLock(this)); 206 AddTrayItem(new TrayCapsLock(this));
213 // TODO(jamescook): Remove this when mus has support for display management 207 // TODO(jamescook): Remove this when mus has support for display management
(...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after
786 .work_area() 780 .work_area()
787 .height(); 781 .height();
788 if (work_area_height > 0) { 782 if (work_area_height > 0) {
789 UMA_HISTOGRAM_CUSTOM_COUNTS( 783 UMA_HISTOGRAM_CUSTOM_COUNTS(
790 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu", 784 "Ash.SystemMenu.PercentageOfWorkAreaHeightCoveredByMenu",
791 100 * bubble_view->height() / work_area_height, 1, 300, 100); 785 100 * bubble_view->height() / work_area_height, 1, 300, 100);
792 } 786 }
793 } 787 }
794 788
795 } // namespace ash 789 } // namespace ash
OLDNEW
« 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