Revert 134774 because of win aura compile and chromium os browser_test crashes - Created uber tray …

ash/system/tray/system_tray_delegate.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/power/power_supply_status.h"
-#include "base/file_path.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 class SkBitmap;
 
 namespace ash {
 
 struct ASH_EXPORT NetworkIconInfo {
   NetworkIconInfo();
@@ skipping 11 matching lines @@
   BluetoothDeviceInfo();
   ~BluetoothDeviceInfo();
 
   std::string address;
   string16 display_name;
   bool connected;
 };
 
 typedef std::vector<BluetoothDeviceInfo> BluetoothDeviceList;
 
-// Structure that packs progress information of each operation.
-struct ASH_EXPORT DriveOperationStatus {
-  enum OperationType {
-    OPERATION_UPLOAD,
-    OPERATION_DOWNLOAD,
-    OPERATION_OTHER,
-  };
-
-  enum OperationState {
-    OPERATION_NOT_STARTED,
-    OPERATION_STARTED,
-    OPERATION_IN_PROGRESS,
-    OPERATION_COMPLETED,
-    OPERATION_FAILED,
-    OPERATION_SUSPENDED,
-  };
-
-  DriveOperationStatus();
-  ~DriveOperationStatus();
-
-  // File path.
-  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();
 
   bool selected;
   std::string key;
   string16 name;
 };
 
 typedef std::vector<IMEPropertyInfo> IMEPropertyInfoList;
@@ skipping 43 matching lines @@
 
   // Shows the settings related to date, timezone etc.
   virtual void ShowDateSettings() = 0;
 
   // Shows the settings related to network.
   virtual void ShowNetworkSettings() = 0;
 
   // Shows the settings related to bluetooth.
   virtual void ShowBluetoothSettings() = 0;
 
-  // Shows settings related to Google Drive.
-  virtual void ShowDriveSettings() = 0;
-
   // Shows settings related to input methods.
   virtual void ShowIMESettings() = 0;
 
   // Shows help.
   virtual void ShowHelp() = 0;
 
   // Is the system audio muted?
   virtual bool IsAudioMuted() const = 0;
 
   // Mutes/Unmutes the audio system.
@@ skipping 40 matching lines @@
 
   // Returns a list of properties for the currently selected IME.
   virtual void GetCurrentIMEProperties(IMEPropertyInfoList* list) = 0;
 
   // Switches to the selected input method.
   virtual void SwitchIME(const std::string& ime_id) = 0;
 
   // Activates an IME property.
   virtual void ActivateIMEProperty(const std::string& key) = 0;
 
-  // Cancels ongoing drive operation.
-  virtual void CancelDriveOperation(const FilePath& file_path) = 0;
-
-  // Returns information about the ongoing drive operations.
-  virtual void GetDriveOperationStatusList(
-      DriveOperationStatusList* list) = 0;
-
   // Returns information about the most relevant network. Relevance is
   // determined by the implementor (e.g. a connecting network may be more
   // relevant over a connected network etc.)
   virtual void GetMostRelevantNetworkIcon(NetworkIconInfo* info,
                                           bool large) = 0;
 
   // Returns information about the available networks.
   virtual void GetAvailableNetworks(std::vector<NetworkIconInfo>* list) = 0;
 
   // Connects to the network specified by the unique id.
@@ skipping 60 matching lines @@
   // Opens the cellular network specific URL.
   virtual void ShowCellularURL(const std::string& url) = 0;
 
   // Shows UI for changing proxy settings.
   virtual void ChangeProxySettings() = 0;
 };
 
 }  // namespace ash
 
 #endif  // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_