Index: chrome/browser/ui/ash/screenshot_taker.cc |
diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc |
index 2f7c7c173e1e1e67c6835820b8e671a2d8bfd98e..0b6fe0478aada26e6242aae302a663325676b781 100644 |
--- a/chrome/browser/ui/ash/screenshot_taker.cc |
+++ b/chrome/browser/ui/ash/screenshot_taker.cc |
@@ -73,9 +73,9 @@ void SaveScreenshot(const FilePath& screenshot_path, |
// TODO(kinaba): crbug.com/140425, remove this ungly #ifdef dispatch. |
#ifdef OS_CHROMEOS |
void SaveScreenshotToDrive(scoped_refptr<base::RefCountedBytes> png_data, |
- gdata::DriveFileError error, |
+ drive::DriveFileError error, |
const FilePath& local_path) { |
- if (error != gdata::DRIVE_FILE_OK) { |
+ if (error != drive::DRIVE_FILE_OK) { |
LOG(ERROR) << "Failed to write screenshot image to Google Drive: " << error; |
return; |
} |
@@ -86,12 +86,12 @@ void EnsureDirectoryExistsCallback( |
Profile* profile, |
const FilePath& screenshot_path, |
scoped_refptr<base::RefCountedBytes> png_data, |
- gdata::DriveFileError error) { |
+ drive::DriveFileError error) { |
// It is okay to fail with DRIVE_FILE_ERROR_EXISTS since anyway the directory |
// of the target file exists. |
- if (error == gdata::DRIVE_FILE_OK || |
- error == gdata::DRIVE_FILE_ERROR_EXISTS) { |
- gdata::util::PrepareWritableFileAndRun( |
+ if (error == drive::DRIVE_FILE_OK || |
+ error == drive::DRIVE_FILE_ERROR_EXISTS) { |
+ drive::util::PrepareWritableFileAndRun( |
profile, |
screenshot_path, |
base::Bind(&SaveScreenshotToDrive, png_data)); |
@@ -103,10 +103,10 @@ void EnsureDirectoryExistsCallback( |
void PostSaveScreenshotTask(const FilePath& screenshot_path, |
scoped_refptr<base::RefCountedBytes> png_data) { |
- if (gdata::util::IsUnderDriveMountPoint(screenshot_path)) { |
+ if (drive::util::IsUnderDriveMountPoint(screenshot_path)) { |
Profile* profile = ProfileManager::GetDefaultProfileOrOffTheRecord(); |
if (profile) { |
- gdata::util::EnsureDirectoryExists( |
+ drive::util::EnsureDirectoryExists( |
profile, |
screenshot_path.DirName(), |
base::Bind(&EnsureDirectoryExistsCallback, |