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

chrome/browser/chromeos/gdata/gdata_operation_registry.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 CHROME_BROWSER_CHROMEOS_GDATA_GDATA_OPERATION_REGISTRY_H_
 #define CHROME_BROWSER_CHROMEOS_GDATA_GDATA_OPERATION_REGISTRY_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 51 matching lines @@
     // Current state of the transfer;
     OperationTransferState transfer_state;
     // The time when the operation is initiated.
     base::Time start_time;
     // Current fraction of progress of the operation.
     int64 progress_current;
     // Expected total number of bytes to be transferred in the operation.
     // -1 if no expectation is available (yet).
     int64 progress_total;
   };
-  typedef std::vector<ProgressStatus> ProgressStatusList;
 
   // Observer interface for listening changes in the active set of operations.
   class Observer {
    public:
     // Called when a GData operation started, made some progress, or finished.
-    virtual void OnProgressUpdate(const ProgressStatusList& list) = 0;
+    virtual void OnProgressUpdate(const std::vector<ProgressStatus>& list) = 0;
    protected:
     virtual ~Observer() {}
   };
 
   // Base class for operations that this registry class can maintain.
   // The Operation objects are owned by the registry. In particular, calling
   // NotifyFinish() causes the registry to delete the Operation object itself.
   class Operation {
    public:
     explicit Operation(GDataOperationRegistry* registry);
@@ skipping 33 matching lines @@
   };
 
   // Cancels all in-flight operations.
   void CancelAll();
 
   // Cancels ongoing operation for a given virtual |file_path|. Returns true if
   // the operation was found and canceled.
   bool CancelForFilePath(const FilePath& file_path);
 
   // Obtains the list of currently active operations.
-  ProgressStatusList GetProgressStatusList();
+  std::vector<ProgressStatus> GetProgressStatusList();
 
   // Sets the observer.
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
  private:
   // Handlers for notifications from Operations.
   friend class Operation;
   // The registry assigns a fresh operation ID and return it to *id.
   void OnOperationStart(Operation* operation, OperationID* id);
   void OnOperationProgress(OperationID operation);
   void OnOperationFinish(OperationID operation);
   void OnOperationSuspend(OperationID operation);
   void OnOperationResume(Operation* operation, ProgressStatus* new_status);
 
   bool IsFileTransferOperation(const Operation* operation) const;
 
   typedef IDMap<Operation, IDMapOwnPointer> OperationIDMap;
   OperationIDMap in_flight_operations_;
   ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(GDataOperationRegistry);
 };
 
 }  // namespace gdata
 
 #endif  // CHROME_BROWSER_CHROMEOS_GDATA_GDATA_OPERATION_REGISTRY_H_