7 files changed, 0 insertions, 89 deletions
diff --git a/ash/system/tray/default_system_tray_delegate.cc b/ash/system/tray/default_system_tray_delegate.cc
index 839575bef..e2aeae3 100644
--- a/ash/system/tray/default_system_tray_delegate.cc
+++ b/ash/system/tray/default_system_tray_delegate.cc
@@ -124,9 +124,6 @@ bool DefaultSystemTrayDelegate::ShouldShowDisplayNotification() {
   return false;
 }
 
-void DefaultSystemTrayDelegate::ShowDriveSettings() {
-}
-
 void DefaultSystemTrayDelegate::ShowIMESettings() {
 }
 
@@ -205,13 +202,6 @@ void DefaultSystemTrayDelegate::SwitchIME(const std::string& ime_id) {
 void DefaultSystemTrayDelegate::ActivateIMEProperty(const std::string& key) {
 }
 
-void DefaultSystemTrayDelegate::CancelDriveOperation(int32 operation_id) {
-}
-
-void DefaultSystemTrayDelegate::GetDriveOperationStatusList(
-    ash::DriveOperationStatusList*) {
-}
-
 void DefaultSystemTrayDelegate::ShowNetworkConfigure(
     const std::string& network_id,
     gfx::NativeWindow parent_window) {
diff --git a/ash/system/tray/default_system_tray_delegate.h b/ash/system/tray/default_system_tray_delegate.h
index 84594bd..0c7625b 100644
--- a/ash/system/tray/default_system_tray_delegate.h
+++ b/ash/system/tray/default_system_tray_delegate.h
@@ -40,7 +40,6 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {
   virtual void ShowDisplaySettings() OVERRIDE;
   virtual void ShowChromeSlow() OVERRIDE;
   virtual bool ShouldShowDisplayNotification() OVERRIDE;
-  virtual void ShowDriveSettings() OVERRIDE;
   virtual void ShowIMESettings() OVERRIDE;
   virtual void ShowHelp() OVERRIDE;
   virtual void ShowAccessibilityHelp() OVERRIDE;
@@ -65,9 +64,6 @@ class ASH_EXPORT DefaultSystemTrayDelegate : public SystemTrayDelegate {
   virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) OVERRIDE;
   virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
   virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
-  virtual void CancelDriveOperation(int32 operation_id) OVERRIDE;
-  virtual void GetDriveOperationStatusList(
-      ash::DriveOperationStatusList*) OVERRIDE;
   virtual void ShowNetworkConfigure(const std::string& network_id,
                                     gfx::NativeWindow parent_window) OVERRIDE;
   virtual bool EnrollNetwork(const std::string& network_id,
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index ef0d0fd..a28f784 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -13,7 +13,6 @@
 #include "ash/system/audio/tray_audio.h"
 #include "ash/system/bluetooth/tray_bluetooth.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/status_area_widget.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ -183,7 +182,6 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
   AddTrayItem(new TrayVPN(this));
   AddTrayItem(new TraySms(this));
   AddTrayItem(new TrayBluetooth(this));
-  AddTrayItem(new TrayDrive(this));
   AddTrayItem(new TrayDisplay(this));
   AddTrayItem(new ScreenCaptureTrayItem(this));
   AddTrayItem(new ScreenShareTrayItem(this));
@@ -205,7 +203,6 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
   AddTrayItem(new TrayIME(this));
   AddTrayItem(tray_accessibility_);
   AddTrayItem(new TrayBluetooth(this));
-  AddTrayItem(new TrayDrive(this));
   AddTrayItem(new TrayUpdate(this));
   AddTrayItem(tray_date_);
 #endif
diff --git a/ash/system/tray/system_tray_delegate.cc b/ash/system/tray/system_tray_delegate.cc
index 084e158..d0b9fb1 100644
--- a/ash/system/tray/system_tray_delegate.cc
+++ b/ash/system/tray/system_tray_delegate.cc
@@ -25,16 +25,6 @@ BluetoothDeviceInfo::BluetoothDeviceInfo()
 BluetoothDeviceInfo::~BluetoothDeviceInfo() {
 }
 
-DriveOperationStatus::DriveOperationStatus()
-    : id(-1),
-      progress(0.0),
-      type(OPERATION_DOWNLOAD),
-      state(OPERATION_NOT_STARTED) {
-}
-
-DriveOperationStatus::~DriveOperationStatus() {
-}
-
 IMEInfo::IMEInfo()
     : selected(false),
       third_party(false) {
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index dffa9f1..de86112 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -53,37 +53,6 @@ struct ASH_EXPORT BluetoothDeviceInfo {
 
 typedef std::vector<BluetoothDeviceInfo> BluetoothDeviceList;
 
-// Structure that packs progress information of each operation.
-struct ASH_EXPORT DriveOperationStatus {
-  enum OperationType {
-    OPERATION_UPLOAD,
-    OPERATION_DOWNLOAD
-  };
-
-  enum OperationState {
-    OPERATION_NOT_STARTED,
-    OPERATION_IN_PROGRESS,
-    OPERATION_COMPLETED,
-    OPERATION_FAILED,
-  };
-
-  DriveOperationStatus();
-  ~DriveOperationStatus();
-
-  // Unique ID for the operation.
-  int32 id;
-
-  // File path.
-  base::FilePath file_path;
-  // Current operation completion progress [0.0 - 1.0].
-  double progress;
-  OperationType type;
-  OperationState state;
-};
-
-typedef std::vector<DriveOperationStatus> DriveOperationStatusList;
-
-
 struct ASH_EXPORT IMEPropertyInfo {
   IMEPropertyInfo();
   ~IMEPropertyInfo();
@@ -185,9 +154,6 @@ class ASH_EXPORT SystemTrayDelegate {
   // should appear.
   virtual bool ShouldShowDisplayNotification() = 0;
 
-  // Shows settings related to Google Drive.
-  virtual void ShowDriveSettings() = 0;
-
   // Shows settings related to input methods.
   virtual void ShowIMESettings() = 0;
 
@@ -264,13 +230,6 @@ class ASH_EXPORT SystemTrayDelegate {
   // Activates an IME property.
   virtual void ActivateIMEProperty(const std::string& key) = 0;
 
-  // Cancels ongoing drive operation.
-  virtual void CancelDriveOperation(int32 operation_id) = 0;
-
-  // Returns information about the ongoing drive operations.
-  virtual void GetDriveOperationStatusList(
-      DriveOperationStatusList* list) = 0;
-
   // Shows UI to configure or activate the network specified by |network_id|,
   // which may include showing Payment or Portal UI when appropriate.
   // |parent_window| is used to parent any configuration UI. If NULL a default
diff --git a/ash/system/tray/system_tray_notifier.cc b/ash/system/tray/system_tray_notifier.cc
index 5801ce6..1a55f8a 100644
--- a/ash/system/tray/system_tray_notifier.cc
+++ b/ash/system/tray/system_tray_notifier.cc
@@ -53,14 +53,6 @@ void SystemTrayNotifier::RemoveClockObserver(ClockObserver* observer) {
   clock_observers_.RemoveObserver(observer);
 }
 
-void SystemTrayNotifier::AddDriveObserver(DriveObserver* observer) {
-  drive_observers_.AddObserver(observer);
-}
-
-void SystemTrayNotifier::RemoveDriveObserver(DriveObserver* observer) {
-  drive_observers_.RemoveObserver(observer);
-}
-
 void SystemTrayNotifier::AddIMEObserver(IMEObserver* observer) {
   ime_observers_.AddObserver(observer);
 }
@@ -276,13 +268,6 @@ void SystemTrayNotifier::NotifySystemClockCanSetTimeChanged(bool can_set_time) {
                     OnSystemClockCanSetTimeChanged(can_set_time));
 }
 
-void SystemTrayNotifier::NotifyDriveJobUpdated(
-    const DriveOperationStatus& status) {
-  FOR_EACH_OBSERVER(DriveObserver,
-                    drive_observers_,
-                    OnDriveJobUpdated(status));
-}
-
 void SystemTrayNotifier::NotifyRefreshIME() {
   FOR_EACH_OBSERVER(IMEObserver,
                     ime_observers_,
diff --git a/ash/system/tray/system_tray_notifier.h b/ash/system/tray/system_tray_notifier.h
index 6e6b03f..4015319 100644
--- a/ash/system/tray/system_tray_notifier.h
+++ b/ash/system/tray/system_tray_notifier.h
@@ -13,7 +13,6 @@
 #include "ash/system/bluetooth/bluetooth_observer.h"
 #include "ash/system/chromeos/tray_tracing.h"
 #include "ash/system/date/clock_observer.h"
-#include "ash/system/drive/drive_observer.h"
 #include "ash/system/ime/ime_observer.h"
 #include "ash/system/locale/locale_observer.h"
 #include "ash/system/tray_accessibility.h"
@@ -57,9 +56,6 @@ class ASH_EXPORT SystemTrayNotifier {
   void AddClockObserver(ClockObserver* observer);
   void RemoveClockObserver(ClockObserver* observer);
 
-  void AddDriveObserver(DriveObserver* observer);
-  void RemoveDriveObserver(DriveObserver* observer);
-
   void AddIMEObserver(IMEObserver* observer);
   void RemoveIMEObserver(IMEObserver* observer);
 
@@ -120,7 +116,6 @@ class ASH_EXPORT SystemTrayNotifier {
   void NotifyDateFormatChanged();
   void NotifySystemClockTimeUpdated();
   void NotifySystemClockCanSetTimeChanged(bool can_set_time);
-  void NotifyDriveJobUpdated(const DriveOperationStatus& status);
   void NotifyRefreshIME();
   void NotifyLocaleChanged(LocaleObserver::Delegate* delegate,
                            const std::string& cur_locale,
@@ -156,7 +151,6 @@ class ASH_EXPORT SystemTrayNotifier {
   ObserverList<AudioObserver> audio_observers_;
   ObserverList<BluetoothObserver> bluetooth_observers_;
   ObserverList<ClockObserver> clock_observers_;
-  ObserverList<DriveObserver> drive_observers_;
   ObserverList<IMEObserver> ime_observers_;
   ObserverList<LocaleObserver> locale_observers_;
   ObserverList<TracingObserver> tracing_observers_;