| Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
|
| diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
|
| index 7576baa562708663a504dd2e63ab44ea25474b38..702d358d080c8692b0d75fa4737518a800ffd224 100644
|
| --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
|
| +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.cc
|
| @@ -7,7 +7,7 @@
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "apps/saved_files_service.h"
|
| +#include "apps/saved_files_service_impl.h"
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/strings/string_split.h"
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "extensions/browser/api/device_permissions_manager.h"
|
| +#include "extensions/browser/api/file_system/saved_files_service.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/permissions/api_permission.h"
|
| #include "extensions/common/permissions/permissions_data.h"
|
| @@ -274,8 +275,9 @@ AppInfoPermissionsPanel::GetActivePermissionMessages() const {
|
| int AppInfoPermissionsPanel::GetRetainedFileCount() const {
|
| if (app_->permissions_data()->HasAPIPermission(
|
| extensions::APIPermission::kFileSystem)) {
|
| - apps::SavedFilesService* service = apps::SavedFilesService::Get(profile_);
|
| - // The SavedFilesService can be null for incognito profiles. See
|
| + apps::SavedFilesServiceImpl* service =
|
| + apps::SavedFilesServiceImpl::Get(profile_);
|
| + // The SavedFilesServiceImpl can be null for incognito profiles. See
|
| // http://crbug.com/467795.
|
| if (service)
|
| return service->GetAllFileEntries(app_->id()).size();
|
| @@ -293,13 +295,14 @@ AppInfoPermissionsPanel::GetRetainedFilePaths() const {
|
| std::vector<base::string16> retained_file_paths;
|
| if (app_->permissions_data()->HasAPIPermission(
|
| extensions::APIPermission::kFileSystem)) {
|
| - apps::SavedFilesService* service = apps::SavedFilesService::Get(profile_);
|
| - // The SavedFilesService can be null for incognito profiles.
|
| + apps::SavedFilesServiceImpl* service =
|
| + apps::SavedFilesServiceImpl::Get(profile_);
|
| + // The SavedFilesServiceImpl can be null for incognito profiles.
|
| if (service) {
|
| - std::vector<apps::SavedFileEntry> retained_file_entries =
|
| + std::vector<extensions::SavedFilesService::Entry> retained_file_entries =
|
| service->GetAllFileEntries(app_->id());
|
| - for (std::vector<apps::SavedFileEntry>::const_iterator it =
|
| - retained_file_entries.begin();
|
| + for (std::vector<extensions::SavedFilesService::Entry>::const_iterator
|
| + it = retained_file_entries.begin();
|
| it != retained_file_entries.end(); ++it) {
|
| retained_file_paths.push_back(it->path.LossyDisplayName());
|
| }
|
| @@ -309,8 +312,9 @@ AppInfoPermissionsPanel::GetRetainedFilePaths() const {
|
| }
|
|
|
| void AppInfoPermissionsPanel::RevokeFilePermissions() {
|
| - apps::SavedFilesService* service = apps::SavedFilesService::Get(profile_);
|
| - // The SavedFilesService can be null for incognito profiles.
|
| + apps::SavedFilesServiceImpl* service =
|
| + apps::SavedFilesServiceImpl::Get(profile_);
|
| + // The SavedFilesServiceImpl can be null for incognito profiles.
|
| if (service)
|
| service->ClearQueue(app_);
|
| apps::AppLoadService::Get(profile_)->RestartApplicationIfRunning(app_->id());
|
|
|