chrome/browser/ui/webui/screenshot_source.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/screenshot_source.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/screenshot_source.cc

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

index 4597a1a9b27e5643c207277e4b74992b8b14f7ba..b95ecd0d110efbb95aaa927c6af590ede25764a5 100644

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

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

@@ -22,7 +22,7 @@

#include "ash/shell.h"

#include "ash/shell_delegate.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 "content/public/browser/browser_thread.h"

#endif

@@ -96,7 +96,7 @@ void ScreenshotSource::SendScreenshot(const std::string& screenshot_path,

FilePath download_path = download_prefs->DownloadPath();

if (gdata::util::IsUnderGDataMountPoint(download_path)) {

gdata::DriveFileSystemInterface* file_system =

- gdata::GDataSystemServiceFactory::GetForProfile(

+ gdata::DriveSystemServiceFactory::GetForProfile(

profile_)->file_system();

file_system->GetFileByResourceId(

decoded_filename,

« no previous file with comments | « chrome/browser/ui/webui/feedback_ui.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »