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 238d6a2d5e1920dd39d40a66a0d8402a7365e37b..ff840578223b8863853127a3a87f7aa94722167c 100644 |
--- a/chrome/browser/ui/webui/feedback_ui.cc |
+++ b/chrome/browser/ui/webui/feedback_ui.cc |
@@ -105,8 +105,8 @@ std::string GetUserEmail() { |
return manager->GetLoggedInUser().display_email(); |
} |
-bool ScreenshotDriveTimestampComp(const gdata::DriveEntryProto& entry1, |
- const gdata::DriveEntryProto& entry2) { |
+bool ScreenshotDriveTimestampComp(const drive::DriveEntryProto& entry1, |
+ const drive::DriveEntryProto& entry2) { |
return entry1.file_info().last_modified() > |
entry2.file_info().last_modified(); |
} |
@@ -114,18 +114,18 @@ bool ScreenshotDriveTimestampComp(const gdata::DriveEntryProto& entry1, |
void ReadDirectoryCallback(size_t max_saved, |
std::vector<std::string>* saved_screenshots, |
base::Closure callback, |
- gdata::DriveFileError error, |
+ drive::DriveFileError error, |
bool hide_hosted_documents, |
- scoped_ptr<gdata::DriveEntryProtoVector> entries) { |
- if (error != gdata::DRIVE_FILE_OK) { |
+ scoped_ptr<drive::DriveEntryProtoVector> entries) { |
+ if (error != drive::DRIVE_FILE_OK) { |
callback.Run(); |
return; |
} |
size_t max_scan = std::min(kMaxNumScanFiles, entries->size()); |
- std::vector<gdata::DriveEntryProto> screenshot_entries; |
+ std::vector<drive::DriveEntryProto> screenshot_entries; |
for (size_t i = 0; i < max_scan; ++i) { |
- const gdata::DriveEntryProto& entry = (*entries)[i]; |
+ const drive::DriveEntryProto& entry = (*entries)[i]; |
if (StartsWithASCII(entry.base_name(), |
ScreenshotSource::kScreenshotPrefix, true) && |
EndsWith(entry.base_name(), |
@@ -140,7 +140,7 @@ void ReadDirectoryCallback(size_t max_saved, |
screenshot_entries.end(), |
ScreenshotDriveTimestampComp); |
for (size_t i = 0; i < sort_size; ++i) { |
- const gdata::DriveEntryProto& entry = screenshot_entries[i]; |
+ const drive::DriveEntryProto& entry = screenshot_entries[i]; |
saved_screenshots->push_back( |
std::string(ScreenshotSource::kScreenshotUrlRoot) + |
std::string(ScreenshotSource::kScreenshotSaved) + |
@@ -558,7 +558,7 @@ void FeedbackHandler::HandleRefreshSavedScreenshots(const ListValue*) { |
base::Closure refresh_callback = base::Bind( |
&FeedbackHandler::RefreshSavedScreenshotsCallback, |
AsWeakPtr(), base::Owned(saved_screenshots)); |
- if (gdata::util::IsUnderDriveMountPoint(filepath)) { |
+ if (drive::util::IsUnderDriveMountPoint(filepath)) { |
GetMostRecentScreenshotsDrive( |
filepath, saved_screenshots, kMaxSavedScreenshots, refresh_callback); |
} else { |
@@ -581,11 +581,11 @@ void FeedbackHandler::RefreshSavedScreenshotsCallback( |
void FeedbackHandler::GetMostRecentScreenshotsDrive( |
const FilePath& filepath, std::vector<std::string>* saved_screenshots, |
size_t max_saved, base::Closure callback) { |
- gdata::DriveFileSystemInterface* file_system = |
- gdata::DriveSystemServiceFactory::GetForProfile( |
+ drive::DriveFileSystemInterface* file_system = |
+ drive::DriveSystemServiceFactory::GetForProfile( |
Profile::FromWebUI(web_ui()))->file_system(); |
file_system->ReadDirectoryByPath( |
- gdata::util::ExtractDrivePath(filepath), |
+ drive::util::ExtractDrivePath(filepath), |
base::Bind(&ReadDirectoryCallback, max_saved, saved_screenshots, |
callback)); |
} |