diff options
| author | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-29 01:08:29 +0000 |
|---|---|---|
| committer | yoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-29 01:08:29 +0000 |
| commit | 5a55f3f8ab42c7d3f6f116bba04de638ea510c5b (patch) | |
| tree | 5ef96f37f486fe9e6e8a45a89bbfa5e2c218ac8c /chrome/browser/background | |
| parent | 6065748f99f48c4cc0d34600b7cc3c2de8d1c0e4 (diff) | |
| download | chromium_src-5a55f3f8ab42c7d3f6f116bba04de638ea510c5b.zip chromium_src-5a55f3f8ab42c7d3f6f116bba04de638ea510c5b.tar.gz chromium_src-5a55f3f8ab42c7d3f6f116bba04de638ea510c5b.tar.bz2 | |
Move PermissionSet to top-level extensions.
BUG=310171
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/42723002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/background')
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/background/background_application_list_model.cc b/chrome/browser/background/background_application_list_model.cc index 11c4406..ae34df73 100644 --- a/chrome/browser/background/background_application_list_model.cc +++ b/chrome/browser/background/background_application_list_model.cc @@ -27,10 +27,10 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_icon_set.h" #include "chrome/common/extensions/manifest_handlers/icons_handler.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "extensions/common/extension_resource.h" +#include "extensions/common/permissions/permission_set.h" #include "ui/base/l10n/l10n_util_collator.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/background/background_application_list_model_unittest.cc b/chrome/browser/background/background_application_list_model_unittest.cc index 62aa6c2..a2a0b6d 100644 --- a/chrome/browser/background/background_application_list_model_unittest.cc +++ b/chrome/browser/background/background_application_list_model_unittest.cc @@ -19,12 +19,12 @@ #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/permissions_updater.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/test/base/testing_profile.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_types.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/api_permission.h" +#include "extensions/common/permissions/permission_set.h" #include "testing/gtest/include/gtest/gtest.h" // This value is used to seed the PRNG at the beginning of a sequence of diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc index 65a593b..ccff276 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc @@ -38,10 +38,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" -#include "chrome/common/extensions/permissions/permission_set.h" #include "chrome/common/pref_names.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" +#include "extensions/common/permissions/permission_set.h" #include "grit/chrome_unscaled_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" |