diff options
Diffstat (limited to 'chrome/browser/ui')
4 files changed, 10 insertions, 4 deletions
diff --git a/chrome/browser/ui/app_list/drive/drive_app_converter_browsertest.cc b/chrome/browser/ui/app_list/drive/drive_app_converter_browsertest.cc index ec6ba39..095a51b 100644 --- a/chrome/browser/ui/app_list/drive/drive_app_converter_browsertest.cc +++ b/chrome/browser/ui/app_list/drive/drive_app_converter_browsertest.cc @@ -20,6 +20,7 @@ #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/icons_handler.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" @@ -110,7 +111,7 @@ IN_PROC_BROWSER_TEST_F(DriveAppConverterTest, GoodApp) { EXPECT_EQ(GURL(kAppUrl), extensions::AppLaunchInfo::GetLaunchWebURL(app)); EXPECT_EQ(extensions::LAUNCH_CONTAINER_TAB, extensions::AppLaunchInfo::GetLaunchContainer(app)); - EXPECT_EQ(0u, app->GetActivePermissions()->apis().size()); + EXPECT_EQ(0u, app->permissions_data()->active_permissions()->apis().size()); EXPECT_EQ(1u, extensions::IconsInfo::GetIcons(app).map().size()); const extensions::Extension* installed = diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_tab.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_tab.cc index 6247254..9236ebc 100644 --- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_tab.cc +++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_tab.cc @@ -14,6 +14,7 @@ #include "extensions/common/manifest_handlers/permissions_parser.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permission_message_provider.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -467,7 +468,8 @@ AppInfoPermissionsTab::GetOptionalPermissionMessages() const { const std::vector<base::FilePath> AppInfoPermissionsTab::GetRetainedFilePermissions() const { std::vector<base::FilePath> retained_file_paths; - if (app_->HasAPIPermission(extensions::APIPermission::kFileSystem)) { + if (app_->permissions_data()->HasAPIPermission( + extensions::APIPermission::kFileSystem)) { std::vector<apps::SavedFileEntry> retained_file_entries = apps::SavedFilesService::Get(profile_)->GetAllFileEntries(app_->id()); for (std::vector<apps::SavedFileEntry>::const_iterator it = diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index e50de2f..ccd4e47 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -1066,7 +1066,8 @@ void ExtensionSettingsHandler::HandlePermissionsMessage( extension_id_prompting_ = extension->id(); prompt_.reset(new ExtensionInstallPrompt(web_contents())); std::vector<base::FilePath> retained_file_paths; - if (extension->HasAPIPermission(APIPermission::kFileSystem)) { + if (extension->permissions_data()->HasAPIPermission( + APIPermission::kFileSystem)) { std::vector<apps::SavedFileEntry> retained_file_entries = apps::SavedFilesService::Get(Profile::FromWebUI( web_ui()))->GetAllFileEntries(extension_id_prompting_); diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 4626986..3891aa0 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -44,6 +44,7 @@ #include "content/public/common/page_zoom.h" #include "extensions/common/extension_set.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" @@ -210,7 +211,8 @@ base::DictionaryValue* GetNotificationExceptionForPage( template <APIPermission::ID permission> bool HostedAppHasPermission( const extensions::Extension& extension, Profile* /*profile*/) { - return extension.is_hosted_app() && extension.HasAPIPermission(permission); + return extension.is_hosted_app() && + extension.permissions_data()->HasAPIPermission(permission); } // Add an "Allow"-entry to the list of |exceptions| for a |url_pattern| from |