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

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

Issue 410333005: Remove the drive status from the ash try. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix windows build. Created 6 years, 5 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/default_system_tray_delegate.cc ('k') | ash/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/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"
11 #include "ash/shell/panel_window.h" 11 #include "ash/shell/panel_window.h"
12 #include "ash/shell_window_ids.h" 12 #include "ash/shell_window_ids.h"
13 #include "ash/system/audio/tray_audio.h" 13 #include "ash/system/audio/tray_audio.h"
14 #include "ash/system/bluetooth/tray_bluetooth.h" 14 #include "ash/system/bluetooth/tray_bluetooth.h"
15 #include "ash/system/date/tray_date.h" 15 #include "ash/system/date/tray_date.h"
16 #include "ash/system/drive/tray_drive.h"
17 #include "ash/system/ime/tray_ime.h" 16 #include "ash/system/ime/tray_ime.h"
18 #include "ash/system/status_area_widget.h" 17 #include "ash/system/status_area_widget.h"
19 #include "ash/system/tray/system_tray_delegate.h" 18 #include "ash/system/tray/system_tray_delegate.h"
20 #include "ash/system/tray/system_tray_item.h" 19 #include "ash/system/tray/system_tray_item.h"
21 #include "ash/system/tray/tray_bubble_wrapper.h" 20 #include "ash/system/tray/tray_bubble_wrapper.h"
22 #include "ash/system/tray/tray_constants.h" 21 #include "ash/system/tray/tray_constants.h"
23 #include "ash/system/tray_accessibility.h" 22 #include "ash/system/tray_accessibility.h"
24 #include "ash/system/tray_update.h" 23 #include "ash/system/tray_update.h"
25 #include "ash/system/user/login_status.h" 24 #include "ash/system/user/login_status.h"
26 #include "ash/system/user/tray_user.h" 25 #include "ash/system/user/tray_user.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 AddTrayItem(new TrayEnterprise(this)); 175 AddTrayItem(new TrayEnterprise(this));
177 AddTrayItem(new TraySupervisedUser(this)); 176 AddTrayItem(new TraySupervisedUser(this));
178 AddTrayItem(new TrayIME(this)); 177 AddTrayItem(new TrayIME(this));
179 AddTrayItem(tray_accessibility_); 178 AddTrayItem(tray_accessibility_);
180 AddTrayItem(new TrayTracing(this)); 179 AddTrayItem(new TrayTracing(this));
181 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get())); 180 AddTrayItem(new TrayPower(this, message_center::MessageCenter::Get()));
182 AddTrayItem(new TrayNetwork(this)); 181 AddTrayItem(new TrayNetwork(this));
183 AddTrayItem(new TrayVPN(this)); 182 AddTrayItem(new TrayVPN(this));
184 AddTrayItem(new TraySms(this)); 183 AddTrayItem(new TraySms(this));
185 AddTrayItem(new TrayBluetooth(this)); 184 AddTrayItem(new TrayBluetooth(this));
186 AddTrayItem(new TrayDrive(this));
187 AddTrayItem(new TrayDisplay(this)); 185 AddTrayItem(new TrayDisplay(this));
188 AddTrayItem(new ScreenCaptureTrayItem(this)); 186 AddTrayItem(new ScreenCaptureTrayItem(this));
189 AddTrayItem(new ScreenShareTrayItem(this)); 187 AddTrayItem(new ScreenShareTrayItem(this));
190 AddTrayItem(new MultiProfileMediaTrayItem(this)); 188 AddTrayItem(new MultiProfileMediaTrayItem(this));
191 AddTrayItem(new TrayAudioChromeOs(this)); 189 AddTrayItem(new TrayAudioChromeOs(this));
192 AddTrayItem(new TrayBrightness(this)); 190 AddTrayItem(new TrayBrightness(this));
193 AddTrayItem(new TrayCapsLock(this)); 191 AddTrayItem(new TrayCapsLock(this));
194 AddTrayItem(new TraySettings(this)); 192 AddTrayItem(new TraySettings(this));
195 AddTrayItem(new TrayUpdate(this)); 193 AddTrayItem(new TrayUpdate(this));
196 AddTrayItem(new TrayRotationLock(this)); 194 AddTrayItem(new TrayRotationLock(this));
197 AddTrayItem(tray_date_); 195 AddTrayItem(tray_date_);
198 #elif defined(OS_WIN) 196 #elif defined(OS_WIN)
199 AddTrayItem(tray_accessibility_); 197 AddTrayItem(tray_accessibility_);
200 if (media::CoreAudioUtil::IsSupported()) 198 if (media::CoreAudioUtil::IsSupported())
201 AddTrayItem(new TrayAudioWin(this)); 199 AddTrayItem(new TrayAudioWin(this));
202 AddTrayItem(new TrayUpdate(this)); 200 AddTrayItem(new TrayUpdate(this));
203 AddTrayItem(tray_date_); 201 AddTrayItem(tray_date_);
204 #elif defined(OS_LINUX) 202 #elif defined(OS_LINUX)
205 AddTrayItem(new TrayIME(this)); 203 AddTrayItem(new TrayIME(this));
206 AddTrayItem(tray_accessibility_); 204 AddTrayItem(tray_accessibility_);
207 AddTrayItem(new TrayBluetooth(this)); 205 AddTrayItem(new TrayBluetooth(this));
208 AddTrayItem(new TrayDrive(this));
209 AddTrayItem(new TrayUpdate(this)); 206 AddTrayItem(new TrayUpdate(this));
210 AddTrayItem(tray_date_); 207 AddTrayItem(tray_date_);
211 #endif 208 #endif
212 209
213 SetVisible(ash::Shell::GetInstance()->system_tray_delegate()-> 210 SetVisible(ash::Shell::GetInstance()->system_tray_delegate()->
214 GetTrayVisibilityOnStartup()); 211 GetTrayVisibilityOnStartup());
215 } 212 }
216 213
217 void SystemTray::AddTrayItem(SystemTrayItem* item) { 214 void SystemTray::AddTrayItem(SystemTrayItem* item) {
218 items_.push_back(item); 215 items_.push_back(item);
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 system_bubble_.reset(); 719 system_bubble_.reset();
723 // When closing a system bubble with the alternate shelf layout, we need to 720 // When closing a system bubble with the alternate shelf layout, we need to
724 // turn off the active tinting of the shelf. 721 // turn off the active tinting of the shelf.
725 if (full_system_tray_menu_) { 722 if (full_system_tray_menu_) {
726 SetDrawBackgroundAsActive(false); 723 SetDrawBackgroundAsActive(false);
727 full_system_tray_menu_ = false; 724 full_system_tray_menu_ = false;
728 } 725 }
729 } 726 }
730 727
731 } // namespace ash 728 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/default_system_tray_delegate.cc ('k') | ash/system/tray/system_tray_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698