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

Unified Diff: chrome/browser/chromeos/gdata/gdata_protocol_handler.cc

Issue 10873026: Rename GDataSystemService to DriveSystemService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge issue, remove one include header which is no longer necessary 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/gdata/gdata_protocol_handler.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc b/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc
index 079b11125350f0e2af8160b8ac9a22be50560f11..6b3c81dcaa408db3d26b34e2d9b557ffe2892ee7 100644
--- a/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc
+++ b/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc
@@ -20,8 +20,8 @@
#include "chrome/browser/chromeos/gdata/drive.pb.h"
#include "chrome/browser/chromeos/gdata/drive_file_system_interface.h"
#include "chrome/browser/chromeos/gdata/drive_service_interface.h"
+#include "chrome/browser/chromeos/gdata/drive_system_service.h"
#include "chrome/browser/chromeos/gdata/gdata_errorcode.h"
-#include "chrome/browser/chromeos/gdata/gdata_system_service.h"
#include "chrome/browser/chromeos/gdata/gdata_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -104,21 +104,21 @@ bool ParseDriveUrl(const std::string& path, std::string* resource_id) {
return resource_id->size();
}
-// Helper function to get GDataSystemService from Profile.
-GDataSystemService* GetSystemService() {
- return GDataSystemServiceFactory::GetForProfile(
+// Helper function to get DriveSystemService from Profile.
+DriveSystemService* GetSystemService() {
+ return DriveSystemServiceFactory::GetForProfile(
ProfileManager::GetDefaultProfile());
}
// Helper function to get DriveFileSystem from Profile on UI thread.
void GetFileSystemOnUIThread(DriveFileSystemInterface** file_system) {
- GDataSystemService* system_service = GetSystemService();
+ DriveSystemService* system_service = GetSystemService();
*file_system = system_service ? system_service->file_system() : NULL;
}
// Helper function to cancel GData download operation on UI thread.
void CancelGDataDownloadOnUIThread(const FilePath& gdata_file_path) {
- GDataSystemService* system_service = GetSystemService();
+ DriveSystemService* system_service = GetSystemService();
if (system_service)
system_service->drive_service()->operation_registry()->CancelForFilePath(
gdata_file_path);
« no previous file with comments | « chrome/browser/chromeos/gdata/gdata_download_observer.cc ('k') | chrome/browser/chromeos/gdata/gdata_sync_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698