summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/crx_installer.cc
diff options
context:
space:
mode:
authorrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 20:42:57 +0000
committerrdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-08 20:42:57 +0000
commit5ef835a2c91e112ecf28b589cc5b80ae53e1927f (patch)
treec367bf7148e1e5421beab1478ba1796f4fd9274c /chrome/browser/extensions/crx_installer.cc
parentb5a507b2ce386972331f17678b46de4d95d49c02 (diff)
downloadchromium_src-5ef835a2c91e112ecf28b589cc5b80ae53e1927f.zip
chromium_src-5ef835a2c91e112ecf28b589cc5b80ae53e1927f.tar.gz
chromium_src-5ef835a2c91e112ecf28b589cc5b80ae53e1927f.tar.bz2
Move FeatureSwitch to top-level extensions/
Move FeatureSwitch to extensions/common/ Move the switches used in FeatureSwitch to extensions/common/switches.h (when necessary). Update some uses of the switches to use feature switch instead of the commandline BUG=159265 TBR=rdsmith@chromium.org (c/b/download) TBR=sky@chromium.org (c/b/ui/, c/test/ui/) Review URL: https://codereview.chromium.org/47923018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/crx_installer.cc')
-rw-r--r--chrome/browser/extensions/crx_installer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 9fdb2f4..cbf1715 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -37,7 +37,6 @@
#include "chrome/common/extensions/extension_constants.h"
#include "chrome/common/extensions/extension_file_util.h"
#include "chrome/common/extensions/extension_icon_set.h"
-#include "chrome/common/extensions/feature_switch.h"
#include "chrome/common/extensions/manifest_handlers/kiosk_mode_info.h"
#include "chrome/common/extensions/manifest_handlers/shared_module_info.h"
#include "chrome/common/extensions/manifest_url_handler.h"
@@ -46,6 +45,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/resource_dispatcher_host.h"
#include "content/public/browser/user_metrics.h"
+#include "extensions/common/feature_switch.h"
#include "extensions/common/manifest.h"
#include "extensions/common/permissions/permission_message_provider.h"
#include "extensions/common/permissions/permission_set.h"