chrome/browser/ui/webui/screenshot_source.h - Issue 10877006: Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError

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.h

Issue 10877006: Rename GDataErrorCode to DriveErrorCode, GDataFileError to DriveFileError (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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/gdata/gdata_contacts_service.cc ('K') | « chrome/browser/ui/webui/print_preview/print_preview_handler.cc ('k') | chrome/browser/ui/webui/screenshot_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/screenshot_source.h

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

index 966a4f6f67a58a05f789343c603a1295fd918524..8e834d4611daf26cf354de6f81b20caad0098cde 100644

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

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

@@ -14,8 +14,8 @@

#include "chrome/browser/ui/webui/chrome_url_data_manager.h"

#if defined(OS_CHROMEOS)

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

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

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

#endif

typedef std::vector<unsigned char> ScreenshotData;

@@ -63,7 +63,7 @@ class ScreenshotSource : public ChromeURLDataManager::DataSource {

// The callback for GData's getting file method.

void GetSavedScreenshotCallback(const std::string& screenshot_path,

int request_id,

- gdata::GDataFileError error,

+ gdata::DriveFileError error,

const FilePath& file,

const std::string& unused_mime_type,

gdata::DriveFileType file_type);