Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(627)

Unified Diff: chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc

Issue 127683002: Less dependency for DriveAppRegistry. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 11 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
Index: chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
index 08defa5bfe9d83d430b2b2a834017a05ae884c12..32f99b175f55a6683a4fdb1766ef9a178edb1cbe 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
@@ -144,7 +144,7 @@ void FileBrowserPrivateGetDriveEntryPropertiesFunction::OnGetFileInfo(
// Get drive WebApps that can accept this file. We just need to extract the
// doc icon for the drive app, which is set as default.
- ScopedVector<drive::DriveAppInfo> drive_apps;
+ std::vector<drive::DriveAppInfo> drive_apps;
app_registry->GetAppsForFile(file_path_.Extension(),
file_specific_info.content_mime_type(),
&drive_apps);
@@ -158,11 +158,11 @@ void FileBrowserPrivateGetDriveEntryPropertiesFunction::OnGetFileInfo(
file_manager::file_tasks::ParseTaskID(default_task_id, &default_task);
DCHECK(default_task_id.empty() || !default_task.app_id.empty());
for (size_t i = 0; i < drive_apps.size(); ++i) {
- const drive::DriveAppInfo* app_info = drive_apps[i];
- if (default_task.app_id == app_info->app_id) {
+ const drive::DriveAppInfo& app_info = drive_apps[i];
+ if (default_task.app_id == app_info.app_id) {
// The drive app is set as default. Files.app should use the doc icon.
const GURL doc_icon =
- drive::util::FindPreferredIcon(app_info->document_icons,
+ drive::util::FindPreferredIcon(app_info.document_icons,
drive::util::kPreferredIconSize);
properties_->custom_icon_url.reset(new std::string(doc_icon.spec()));
}
« no previous file with comments | « chrome/browser/chromeos/drive/drive_integration_service.cc ('k') | chrome/browser/chromeos/file_manager/file_tasks.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698