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

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

Issue 10533042: Remove chromeos::GDataFileSystem::GetOperationRegistry() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 6 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
« no previous file with comments | « chrome/browser/chromeos/gdata/mock_gdata_file_system.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b07b1edf7180750fb78ba34471b32a49e968662a..1e7aa7ff55a024fcad3d479d1989f25518648cf2 100644
--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc
@@ -31,6 +31,8 @@
#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/gdata/gdata_documents_service.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/input_method/input_method_manager.h"
@@ -235,8 +237,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
if (gdata::util::IsGDataAvailable(profile)) {
GDataSystemService* system_service =
GDataSystemServiceFactory::FindForProfile(profile);
- if (system_service && system_service->file_system()) {
- system_service->file_system()->GetOperationRegistry()->
+ if (system_service) {
+ system_service->docs_service()->operation_registry()->
RemoveObserver(this);
}
}
@@ -465,10 +467,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
GDataSystemService* system_service =
GDataSystemServiceFactory::FindForProfile(profile);
- if (!system_service || !system_service->file_system())
+ if (!system_service)
return;
- system_service->file_system()->GetOperationRegistry()->CancelForFilePath(
+ system_service->docs_service()->operation_registry()->CancelForFilePath(
file_path);
}
@@ -480,11 +482,11 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
GDataSystemService* system_service =
GDataSystemServiceFactory::FindForProfile(profile);
- if (!system_service || !system_service->file_system())
+ if (!system_service)
return;
*list = GetDriveStatusList(
- system_service->file_system()->GetOperationRegistry()->
+ system_service->docs_service()->operation_registry()->
GetProgressStatusList());
}
@@ -781,11 +783,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
if (gdata::util::IsGDataAvailable(profile)) {
GDataSystemService* system_service =
GDataSystemServiceFactory::FindForProfile(profile);
- if (!system_service || !system_service->file_system())
+ if (!system_service)
return;
- system_service->file_system()->GetOperationRegistry()->
- AddObserver(this);
+ system_service->docs_service()->operation_registry()->AddObserver(this);
}
}
@@ -1119,10 +1120,10 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,
GDataSystemService* system_service =
GDataSystemServiceFactory::FindForProfile(profile);
- if (!system_service || !system_service->file_system())
+ if (!system_service)
return;
- OnProgressUpdate(system_service->file_system()->GetOperationRegistry()->
+ OnProgressUpdate(system_service->docs_service()->operation_registry()->
GetProgressStatusList());
}
« no previous file with comments | « chrome/browser/chromeos/gdata/mock_gdata_file_system.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698