chrome/browser/ui/webui/feedback_ui.cc - Issue 10873026: Rename GDataSystemService to DriveSystemService

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/ui/webui/feedback_ui.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:

Index: chrome/browser/ui/webui/feedback_ui.cc

diff --git a/chrome/browser/ui/webui/feedback_ui.cc b/chrome/browser/ui/webui/feedback_ui.cc

index 84891973b8450b8334db24e769a07e89ba71dba1..1284d03341fa2a48b2c894486ba4ac69f14fbbea 100644

--- a/chrome/browser/ui/webui/feedback_ui.cc

+++ b/chrome/browser/ui/webui/feedback_ui.cc

@@ -61,7 +61,7 @@

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/gdata/drive.pb.h"

#include "chrome/browser/chromeos/gdata/drive_file_system_interface.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/login/user_manager.h"

#include "chrome/browser/chromeos/system/syslogs_provider.h"

@@ -585,7 +585,7 @@ void FeedbackHandler::GetMostRecentScreenshotsGData(

const FilePath& filepath, std::vector<std::string>* saved_screenshots,

size_t max_saved, base::Closure callback) {

gdata::DriveFileSystemInterface* file_system =

- gdata::GDataSystemServiceFactory::GetForProfile(

+ gdata::DriveSystemServiceFactory::GetForProfile(

Profile::FromWebUI(web_ui()))->file_system();

file_system->ReadDirectoryByPath(

gdata::util::ExtractGDataPath(filepath),