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

Unified Diff: chrome/browser/chromeos/extensions/file_manager_util.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/extensions/file_manager_util.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index 12d3c9edf3787c10ef2c37696619fbf095fbc079..b03db90358eb16a2b9802e58020036416f57862c 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
@@ -17,7 +17,7 @@
#include "chrome/browser/chromeos/gdata/drive.pb.h"
#include "chrome/browser/chromeos/gdata/drive_file_system.h"
#include "chrome/browser/chromeos/gdata/drive_files.h"
-#include "chrome/browser/chromeos/gdata/gdata_system_service.h"
+#include "chrome/browser/chromeos/gdata/drive_system_service.h"
#include "chrome/browser/chromeos/gdata/gdata_util.h"
#include "chrome/browser/chromeos/gdata/operation_registry.h"
#include "chrome/browser/chromeos/media/media_player.h"
@@ -625,8 +625,8 @@ bool ExecuteBuiltinHandler(Browser* browser, const FilePath& path,
// Override gdata resource to point to internal handler instead of file:
// URL.
if (gdata::util::GetSpecialRemoteRootPath().IsParent(path)) {
- gdata::GDataSystemService* system_service =
- gdata::GDataSystemServiceFactory::GetForProfile(profile);
+ gdata::DriveSystemService* system_service =
+ gdata::DriveSystemServiceFactory::GetForProfile(profile);
if (!system_service)
return false;
@@ -643,8 +643,8 @@ bool ExecuteBuiltinHandler(Browser* browser, const FilePath& path,
if (IsSupportedGDocsExtension(file_extension.data())) {
if (gdata::util::GetSpecialRemoteRootPath().IsParent(path)) {
// The file is on Google Docs. Get the Docs from the GData service.
- gdata::GDataSystemService* system_service =
- gdata::GDataSystemServiceFactory::GetForProfile(profile);
+ gdata::DriveSystemService* system_service =
+ gdata::DriveSystemServiceFactory::GetForProfile(profile);
if (!system_service)
return false;
« no previous file with comments | « chrome/browser/chromeos/extensions/file_browser_private_api.cc ('k') | chrome/browser/chromeos/gdata/drive_api_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698