diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 21:47:26 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-06 21:47:26 +0000 |
| commit | 076ebedaa781461c668ea435ef3af3ca707775d5 (patch) | |
| tree | 5189adac73248df281db674fff5ce4c08dda0ce8 /apps | |
| parent | 4bd4064aede02bd5ae1c0a4b7a01af4830abb47a (diff) | |
| download | chromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.zip chromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.tar.gz chromium_src-076ebedaa781461c668ea435ef3af3ca707775d5.tar.bz2 | |
Remove deprecated permissions functions from Extension
The methods GetActivePermission() and HasAPIPermission() have been deprecated
for more than a year. Finally remove them.
Also clean up some includes in extension.h, and fix transitive includes.
BUG=379356
TBR=atwilson@chromium.org (c/b/background)
TBR=yurys@chromium.org (c/b/devtools)
TBR=bauerb@chromium.org (c/b/managed_mode)
TBR=dalecurtis@chromium.org (c/b/media)
TBR=dewittj@chromium.org (c/b/notifications)
TBR=msw@chromium.org (c/b/ui)
All TBRs are for strictly mechanical changes - no functional difference.
Review URL: https://codereview.chromium.org/314113010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275531 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_window.cc | 4 | ||||
| -rw-r--r-- | apps/saved_files_service.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/apps/app_window.cc b/apps/app_window.cc index be59b80..dbc28f7 100644 --- a/apps/app_window.cc +++ b/apps/app_window.cc @@ -41,6 +41,7 @@ #include "extensions/common/extension.h" #include "extensions/common/extension_messages.h" #include "extensions/common/manifest_handlers/icons_handler.h" +#include "extensions/common/permissions/permissions_data.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/base/resource/resource_bundle.h" @@ -432,7 +433,8 @@ bool AppWindow::PreHandleKeyboardEvent( if (event.windowsKeyCode == ui::VKEY_ESCAPE && (fullscreen_types_ != FULLSCREEN_TYPE_NONE) && ((fullscreen_types_ & FULLSCREEN_TYPE_FORCED) == 0) && - !extension->HasAPIPermission(APIPermission::kOverrideEscFullscreen)) { + !extension->permissions_data()->HasAPIPermission( + APIPermission::kOverrideEscFullscreen)) { Restore(); return true; } diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index f1e12c7..f8053c0 100644 --- a/apps/saved_files_service.cc +++ b/apps/saved_files_service.cc @@ -19,6 +19,7 @@ #include "extensions/browser/extension_util.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permission_set.h" +#include "extensions/common/permissions/permissions_data.h" namespace apps { @@ -262,7 +263,7 @@ const SavedFileEntry* SavedFilesService::GetFileEntry( void SavedFilesService::ClearQueueIfNoRetainPermission( const Extension* extension) { if (extensions::util::IsEphemeralApp(extension->id(), profile_) || - !extension->GetActivePermissions()->HasAPIPermission( + !extension->permissions_data()->active_permissions()->HasAPIPermission( APIPermission::kFileSystemRetainEntries)) { ClearQueue(extension); } |