summaryrefslogtreecommitdiffstats
path: root/chrome/browser/devtools
diff options
context:
space:
mode:
authoryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-30 00:41:24 +0000
committeryoz@chromium.org <yoz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-30 00:41:24 +0000
commit59b0e604edbb08da5e5f5aff8fa1832c381452ad (patch)
tree11e19df686f8ad68eec53a77e53f5a8fb38662ab /chrome/browser/devtools
parentb54602651640ac17a44429303fbd9bd30f922c61 (diff)
downloadchromium_src-59b0e604edbb08da5e5f5aff8fa1832c381452ad.zip
chromium_src-59b0e604edbb08da5e5f5aff8fa1832c381452ad.tar.gz
chromium_src-59b0e604edbb08da5e5f5aff8fa1832c381452ad.tar.bz2
Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1.
This moves ExtensionSystem to extensions/browser. It also moves setting the channel for Features to ChromeExtensionsBrowserClient. It also removes the duplicate ExtensionSystem::GetForBrowserContext. BUG=337707 TBR=sky@chromium.org Review URL: https://codereview.chromium.org/147923005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/devtools')
-rw-r--r--chrome/browser/devtools/devtools_sanity_browsertest.cc2
-rw-r--r--chrome/browser/devtools/devtools_target_impl.cc2
-rw-r--r--chrome/browser/devtools/devtools_window.cc3
3 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc
index bdb8796..5b28014 100644
--- a/chrome/browser/devtools/devtools_sanity_browsertest.cc
+++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc
@@ -18,7 +18,6 @@
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/lifetime/application_lifetime.h"
#include "chrome/browser/profiles/profile.h"
@@ -49,6 +48,7 @@
#include "content/public/browser/worker_service_observer.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
+#include "extensions/browser/extension_system.h"
#include "extensions/common/switches.h"
#include "net/socket/tcp_listen_socket.h"
#include "net/test/spawned_test_server/spawned_test_server.h"
diff --git a/chrome/browser/devtools/devtools_target_impl.cc b/chrome/browser/devtools/devtools_target_impl.cc
index 8a406c9..767cad0 100644
--- a/chrome/browser/devtools/devtools_target_impl.cc
+++ b/chrome/browser/devtools/devtools_target_impl.cc
@@ -9,7 +9,6 @@
#include "chrome/browser/devtools/devtools_window.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_tab_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
@@ -20,6 +19,7 @@
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
+#include "extensions/browser/extension_system.h"
using content::BrowserThread;
using content::DevToolsAgentHost;
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index ce6f496..0ebd514 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "chrome/browser/devtools/devtools_window.h"
+
#include <algorithm>
#include "base/command_line.h"
@@ -18,7 +19,6 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/debugger/debugger_api.h"
#include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_web_contents_observer.h"
#include "chrome/browser/file_select_helper.h"
#include "chrome/browser/infobars/confirm_infobar_delegate.h"
@@ -64,6 +64,7 @@
#include "content/public/common/content_client.h"
#include "content/public/common/page_transition_types.h"
#include "content/public/common/url_constants.h"
+#include "extensions/browser/extension_system.h"
#include "extensions/common/extension_set.h"
#include "grit/generated_resources.h"
#include "ui/base/l10n/l10n_util.h"