chrome/browser/chromeos/gdata/gdata_system_service.cc - Issue 10874028: Rename GDataFileSystem* to DriveFileSystem*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10874028: Rename GDataFileSystem* to DriveFileSystem* (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:

Index: chrome/browser/chromeos/gdata/gdata_system_service.cc

diff --git a/chrome/browser/chromeos/gdata/gdata_system_service.cc b/chrome/browser/chromeos/gdata/gdata_system_service.cc

index f08c6986b72eabb06eabcfd617f74d0da5523c59..ffd76aa21c9bb258d25e2a769a0711a2ae1c7fa0 100644

--- a/chrome/browser/chromeos/gdata/gdata_system_service.cc

+++ b/chrome/browser/chromeos/gdata/gdata_system_service.cc

@@ -8,12 +8,12 @@

#include "base/bind_helpers.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/chromeos/gdata/drive_api_service.h"

+#include "chrome/browser/chromeos/gdata/drive_file_system.h"

+#include "chrome/browser/chromeos/gdata/drive_file_system_proxy.h"

#include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"

#include "chrome/browser/chromeos/gdata/file_write_helper.h"

#include "chrome/browser/chromeos/gdata/gdata_contacts_service.h"

#include "chrome/browser/chromeos/gdata/gdata_download_observer.h"

-#include "chrome/browser/chromeos/gdata/gdata_file_system.h"

-#include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.h"

#include "chrome/browser/chromeos/gdata/gdata_sync_client.h"

#include "chrome/browser/chromeos/gdata/gdata_uploader.h"

#include "chrome/browser/chromeos/gdata/gdata_util.h"

@@ -65,7 +65,7 @@ void GDataSystemService::Initialize(

blocking_task_runner_);

uploader_.reset(new GDataUploader(drive_service_.get()));

webapps_registry_.reset(new DriveWebAppsRegistry);

- file_system_.reset(new GDataFileSystem(profile_,

+ file_system_.reset(new DriveFileSystem(profile_,

cache(),

drive_service_.get(),

uploader(),

@@ -142,7 +142,7 @@ void GDataSystemService::AddDriveMountPoint() {

if (provider && !provider->HasMountPoint(mount_point)) {

provider->AddRemoteMountPoint(

mount_point,

- new GDataFileSystemProxy(file_system_.get()));

+ new DriveFileSystemProxy(file_system_.get()));

}

file_system_->Initialize();