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

Side by Side Diff: ash/system/tray/system_tray.cc

Issue 473953004: Revert of Multiprofile security: Show a warning messagebox when desktop casting/sharing is turned on upon user (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/user/tray_user.cc » ('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/system/tray/system_tray.h" 5 #include "ash/system/tray/system_tray.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/metrics/user_metrics_recorder.h" 8 #include "ash/metrics/user_metrics_recorder.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 AddTrayItem(new TraySupervisedUser(this)); 175 AddTrayItem(new TraySupervisedUser(this));
176 AddTrayItem(new TrayIME(this)); 176 AddTrayItem(new TrayIME(this));
177 AddTrayItem(tray_accessibility_); 177 AddTrayItem(tray_accessibility_);
178 AddTrayItem(new TrayTracing(this)); 178 AddTrayItem(new TrayTracing(this));
179 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get())); 179 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get()));
180 AddTrayItem(new TrayNetwork(this)); 180 AddTrayItem(new TrayNetwork(this));
181 AddTrayItem(new TrayVPN(this)); 181 AddTrayItem(new TrayVPN(this));
182 AddTrayItem(new TraySms(this)); 182 AddTrayItem(new TraySms(this));
183 AddTrayItem(new TrayBluetooth(this)); 183 AddTrayItem(new TrayBluetooth(this));
184 AddTrayItem(new TrayDisplay(this)); 184 AddTrayItem(new TrayDisplay(this));
185 screen_capture_tray_item_ = new ScreenCaptureTrayItem(this); 185 AddTrayItem(new ScreenCaptureTrayItem(this));
186 AddTrayItem(screen_capture_tray_item_); 186 AddTrayItem(new ScreenShareTrayItem(this));
187 screen_share_tray_item_ = new ScreenShareTrayItem(this);
188 AddTrayItem(screen_share_tray_item_);
189 AddTrayItem(new MultiProfileMediaTrayItem(this)); 187 AddTrayItem(new MultiProfileMediaTrayItem(this));
190 AddTrayItem(new TrayAudioChromeOs(this)); 188 AddTrayItem(new TrayAudioChromeOs(this));
191 AddTrayItem(new TrayBrightness(this)); 189 AddTrayItem(new TrayBrightness(this));
192 AddTrayItem(new TrayCapsLock(this)); 190 AddTrayItem(new TrayCapsLock(this));
193 AddTrayItem(new TraySettings(this)); 191 AddTrayItem(new TraySettings(this));
194 AddTrayItem(new TrayUpdate(this)); 192 AddTrayItem(new TrayUpdate(this));
195 AddTrayItem(new TrayRotationLock(this)); 193 AddTrayItem(new TrayRotationLock(this));
196 AddTrayItem(tray_date_); 194 AddTrayItem(tray_date_);
197 #elif defined(OS_WIN) 195 #elif defined(OS_WIN)
198 AddTrayItem(tray_accessibility_); 196 AddTrayItem(tray_accessibility_);
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 system_bubble_.reset(); 718 system_bubble_.reset();
721 // When closing a system bubble with the alternate shelf layout, we need to 719 // When closing a system bubble with the alternate shelf layout, we need to
722 // turn off the active tinting of the shelf. 720 // turn off the active tinting of the shelf.
723 if (full_system_tray_menu_) { 721 if (full_system_tray_menu_) {
724 SetDrawBackgroundAsActive(false); 722 SetDrawBackgroundAsActive(false);
725 full_system_tray_menu_ = false; 723 full_system_tray_menu_ = false;
726 } 724 }
727 } 725 }
728 726
729 } // namespace ash 727 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698