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

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 10837338: Remove "GData" prefix from non-GData specific classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase. Created 8 years, 4 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: chrome/browser/chromeos/system/ash_system_tray_delegate.cc
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
index 4b2d917ffb2045411349d600fa6779d191bfdfc7..385df2330ce5cbde4f011f0530d06e92a6ec3479 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -36,9 +36,9 @@
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
-#include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
#include "chrome/browser/chromeos/gdata/gdata_system_service.h"
#include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/chromeos/gdata/operation_registry.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
#include "chrome/browser/chromeos/input_method/xkeyboard.h"
@@ -76,7 +76,7 @@
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"
-using gdata::GDataOperationRegistry;
+using gdata::OperationRegistry;
kochi 2012/08/21 05:09:23 Sorted alphabetically.
using gdata::GDataSystemService;
using gdata::GDataSystemServiceFactory;
@@ -108,9 +108,9 @@ void ExtractIMEInfo(const input_method::InputMethodDescriptor& ime,
}
ash::DriveOperationStatusList GetDriveStatusList(
- const std::vector<GDataOperationRegistry::ProgressStatus>& list) {
+ const std::vector<OperationRegistry::ProgressStatus>& list) {
ash::DriveOperationStatusList results;
- for (GDataOperationRegistry::ProgressStatusList::const_iterator it =
+ for (OperationRegistry::ProgressStatusList::const_iterator it =
list.begin();
it != list.end(); ++it) {
ash::DriveOperationStatus status;
@@ -152,7 +152,7 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
public NetworkLibrary::NetworkManagerObserver,
public NetworkLibrary::NetworkObserver,
public NetworkLibrary::CellularDataPlanObserver,
- public gdata::GDataOperationRegistry::Observer,
+ public gdata::OperationRegistry::Observer,
public content::NotificationObserver,
public input_method::InputMethodManager::Observer,
public system::TimezoneSettings::Observer,
@@ -1088,9 +1088,9 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
NotifyRefreshIME(false);
}
- // gdata::GDataOperationRegistry::Observer overrides.
+ // gdata::OperationRegistry::Observer overrides.
virtual void OnProgressUpdate(
- const GDataOperationRegistry::ProgressStatusList& list) {
+ const OperationRegistry::ProgressStatusList& list) {
std::vector<ash::DriveOperationStatus> ui_list = GetDriveStatusList(list);
NotifyRefreshDrive(ui_list);
@@ -1099,15 +1099,15 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
// raise events that will let us properly clear the uber tray state.
if (list.size() > 0) {
bool has_in_progress_items = false;
- for (GDataOperationRegistry::ProgressStatusList::const_iterator it =
+ for (OperationRegistry::ProgressStatusList::const_iterator it =
list.begin();
it != list.end(); ++it) {
if (it->transfer_state ==
- GDataOperationRegistry::OPERATION_STARTED ||
+ OperationRegistry::OPERATION_STARTED ||
it->transfer_state ==
- GDataOperationRegistry::OPERATION_IN_PROGRESS ||
+ OperationRegistry::OPERATION_IN_PROGRESS ||
it->transfer_state ==
- GDataOperationRegistry::OPERATION_SUSPENDED) {
+ OperationRegistry::OPERATION_SUSPENDED) {
has_in_progress_items = true;
break;
}

Powered by Google App Engine
This is Rietveld 408576698