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

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

Issue 850573004: Delete old SmartDeploy UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/system/chromeos/virtual_keyboard/tray_keyboard_lock_unittest.cc ('k') | no next file » | 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 #include "ash/system/chromeos/power/tray_power.h" 52 #include "ash/system/chromeos/power/tray_power.h"
53 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" 53 #include "ash/system/chromeos/rotation/tray_rotation_lock.h"
54 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h" 54 #include "ash/system/chromeos/screen_security/screen_capture_tray_item.h"
55 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h" 55 #include "ash/system/chromeos/screen_security/screen_share_tray_item.h"
56 #include "ash/system/chromeos/session/tray_session_length_limit.h" 56 #include "ash/system/chromeos/session/tray_session_length_limit.h"
57 #include "ash/system/chromeos/settings/tray_settings.h" 57 #include "ash/system/chromeos/settings/tray_settings.h"
58 #include "ash/system/chromeos/supervised/tray_supervised_user.h" 58 #include "ash/system/chromeos/supervised/tray_supervised_user.h"
59 #include "ash/system/chromeos/tray_caps_lock.h" 59 #include "ash/system/chromeos/tray_caps_lock.h"
60 #include "ash/system/chromeos/tray_display.h" 60 #include "ash/system/chromeos/tray_display.h"
61 #include "ash/system/chromeos/tray_tracing.h" 61 #include "ash/system/chromeos/tray_tracing.h"
62 #include "ash/system/chromeos/virtual_keyboard/tray_keyboard_lock.h"
63 #include "ash/system/tray/media_security/multi_profile_media_tray_item.h" 62 #include "ash/system/tray/media_security/multi_profile_media_tray_item.h"
64 #include "ui/message_center/message_center.h" 63 #include "ui/message_center/message_center.h"
65 #elif defined(OS_WIN) 64 #elif defined(OS_WIN)
66 #include "ash/system/win/audio/tray_audio_win.h" 65 #include "ash/system/win/audio/tray_audio_win.h"
67 #include "media/audio/win/core_audio_util_win.h" 66 #include "media/audio/win/core_audio_util_win.h"
68 #endif 67 #endif
69 68
70 using views::TrayBubbleView; 69 using views::TrayBubbleView;
71 70
72 namespace ash { 71 namespace ash {
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get())); 179 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get()));
181 AddTrayItem(new TrayNetwork(this)); 180 AddTrayItem(new TrayNetwork(this));
182 AddTrayItem(new TrayVPN(this)); 181 AddTrayItem(new TrayVPN(this));
183 AddTrayItem(new TraySms(this)); 182 AddTrayItem(new TraySms(this));
184 AddTrayItem(new TrayBluetooth(this)); 183 AddTrayItem(new TrayBluetooth(this));
185 AddTrayItem(new TrayDisplay(this)); 184 AddTrayItem(new TrayDisplay(this));
186 screen_capture_tray_item_ = new ScreenCaptureTrayItem(this); 185 screen_capture_tray_item_ = new ScreenCaptureTrayItem(this);
187 AddTrayItem(screen_capture_tray_item_); 186 AddTrayItem(screen_capture_tray_item_);
188 screen_share_tray_item_ = new ScreenShareTrayItem(this); 187 screen_share_tray_item_ = new ScreenShareTrayItem(this);
189 AddTrayItem(screen_share_tray_item_); 188 AddTrayItem(screen_share_tray_item_);
190 AddTrayItem(new TrayKeyboardLock(this));
191 AddTrayItem(new MultiProfileMediaTrayItem(this)); 189 AddTrayItem(new MultiProfileMediaTrayItem(this));
192 AddTrayItem(new TrayAudioChromeOs(this)); 190 AddTrayItem(new TrayAudioChromeOs(this));
193 AddTrayItem(new TrayBrightness(this)); 191 AddTrayItem(new TrayBrightness(this));
194 AddTrayItem(new TrayCapsLock(this)); 192 AddTrayItem(new TrayCapsLock(this));
195 AddTrayItem(new TrayRotationLock(this)); 193 AddTrayItem(new TrayRotationLock(this));
196 AddTrayItem(new TraySettings(this)); 194 AddTrayItem(new TraySettings(this));
197 AddTrayItem(new TrayUpdate(this)); 195 AddTrayItem(new TrayUpdate(this));
198 AddTrayItem(tray_date_); 196 AddTrayItem(tray_date_);
199 #elif defined(OS_WIN) 197 #elif defined(OS_WIN)
200 AddTrayItem(tray_accessibility_); 198 AddTrayItem(tray_accessibility_);
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 system_bubble_.reset(); 720 system_bubble_.reset();
723 // When closing a system bubble with the alternate shelf layout, we need to 721 // When closing a system bubble with the alternate shelf layout, we need to
724 // turn off the active tinting of the shelf. 722 // turn off the active tinting of the shelf.
725 if (full_system_tray_menu_) { 723 if (full_system_tray_menu_) {
726 SetDrawBackgroundAsActive(false); 724 SetDrawBackgroundAsActive(false);
727 full_system_tray_menu_ = false; 725 full_system_tray_menu_ = false;
728 } 726 }
729 } 727 }
730 728
731 } // namespace ash 729 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/chromeos/virtual_keyboard/tray_keyboard_lock_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698