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

Unified Diff: ash/system/tray/system_tray.cc

Issue 10214013: Created uber tray UI for monitoring ongoing WebDrive sync operations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 364fc555206560601521b3c1a6f9cb047427c496..070df408d3b4b0369156f45ce98dfe331b36090b 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -11,6 +11,7 @@
#include "ash/system/bluetooth/tray_bluetooth.h"
#include "ash/system/brightness/tray_brightness.h"
#include "ash/system/date/tray_date.h"
+#include "ash/system/drive/tray_drive.h"
#include "ash/system/ime/tray_ime.h"
#include "ash/system/network/tray_network.h"
#include "ash/system/power/power_status_observer.h"
@@ -458,6 +459,13 @@ BluetoothDeviceInfo::BluetoothDeviceInfo()
BluetoothDeviceInfo::~BluetoothDeviceInfo() {
}
+DriveOperationStatus::DriveOperationStatus()
sky 2012/05/01 17:17:12 these (and similar structs) belong in system_tray_
zel 2012/05/01 17:45:40 Created system_tray_delegate.cc, moved those struc
+ : progress(0.0), type(OPERATION_OTHER), state(OPERATION_NOT_STARTED) {
+}
+
+DriveOperationStatus::~DriveOperationStatus() {
+}
+
IMEInfo::IMEInfo()
: selected(false) {
}
@@ -480,6 +488,7 @@ SystemTray::SystemTray()
brightness_observer_(NULL),
caps_lock_observer_(NULL),
clock_observer_(NULL),
+ drive_observer_(NULL),
ime_observer_(NULL),
network_observer_(NULL),
power_status_observer_(NULL),
@@ -533,6 +542,7 @@ void SystemTray::CreateItems() {
internal::TrayAccessibility* tray_accessibility =
new internal::TrayAccessibility;
internal::TrayCapsLock* tray_caps_lock = new internal::TrayCapsLock;
+ internal::TrayDrive* tray_drive = new internal::TrayDrive;
internal::TrayIME* tray_ime = new internal::TrayIME;
internal::TrayUpdate* tray_update = new internal::TrayUpdate;
@@ -542,6 +552,7 @@ void SystemTray::CreateItems() {
brightness_observer_ = tray_brightness;
caps_lock_observer_ = tray_caps_lock;
clock_observer_ = tray_date;
+ drive_observer_ = tray_drive;
ime_observer_ = tray_ime;
network_observer_ = tray_network;
power_status_observer_ = tray_power;
@@ -553,6 +564,7 @@ void SystemTray::CreateItems() {
AddTrayItem(tray_power);
AddTrayItem(tray_network);
AddTrayItem(tray_bluetooth);
+ AddTrayItem(tray_drive);
AddTrayItem(tray_ime);
AddTrayItem(tray_volume);
AddTrayItem(tray_brightness);

Powered by Google App Engine
This is Rietveld 408576698