summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/permissions
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 01:08:29 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-29 01:08:29 +0000
commit5a55f3f8ab42c7d3f6f116bba04de638ea510c5b (patch)
tree5ef96f37f486fe9e6e8a45a89bbfa5e2c218ac8c /chrome/browser/extensions/api/permissions
parent6065748f99f48c4cc0d34600b7cc3c2de8d1c0e4 (diff)
downloadchromium_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/extensions/api/permissions')
-rw-r--r--chrome/browser/extensions/api/permissions/permissions_api.h2
-rw-r--r--chrome/browser/extensions/api/permissions/permissions_api_helpers.cc2
-rw-r--r--chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc2
-rw-r--r--chrome/browser/extensions/api/permissions/permissions_apitest.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.h b/chrome/browser/extensions/api/permissions/permissions_api.h
index 8834587..d0d1d39 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.h
+++ b/chrome/browser/extensions/api/permissions/permissions_api.h
@@ -10,7 +10,7 @@
#include "base/compiler_specific.h"
#include "chrome/browser/extensions/chrome_extension_function.h"
#include "chrome/browser/extensions/extension_install_prompt.h"
-#include "chrome/common/extensions/permissions/permission_set.h"
+#include "extensions/common/permissions/permission_set.h"
class ExtensionService;
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
index 3b2e70d..620c8c5 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
@@ -9,9 +9,9 @@
#include "base/values.h"
#include "chrome/common/extensions/api/permissions.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/common/extensions/permissions/permission_set.h"
#include "chrome/common/extensions/permissions/usb_device_permission.h"
#include "extensions/common/error_utils.h"
+#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/permissions/permissions_info.h"
#include "extensions/common/url_pattern_set.h"
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
index b327840..fe3e860 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
@@ -6,7 +6,7 @@
#include "base/values.h"
#include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
#include "chrome/common/extensions/api/permissions.h"
-#include "chrome/common/extensions/permissions/permission_set.h"
+#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/url_pattern_set.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/chrome/browser/extensions/api/permissions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc
index d2923d1..736112f 100644
--- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc
@@ -8,7 +8,7 @@
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/common/extensions/permissions/permission_set.h"
+#include "extensions/common/permissions/permission_set.h"
#include "extensions/common/switches.h"
#include "net/dns/mock_host_resolver.h"