summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_service.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 09:11:26 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-04 09:11:26 +0000
commit017ecde96cd5f6a28b6561404360241862c041b3 (patch)
treedd98b08e398d9ce8bf210351cc73c28451982ccd /chrome/browser/extensions/extension_service.cc
parent752f6b8392f47bf2761c93bbf588bb4a954afa3a (diff)
downloadchromium_src-017ecde96cd5f6a28b6561404360241862c041b3.zip
chromium_src-017ecde96cd5f6a28b6561404360241862c041b3.tar.gz
chromium_src-017ecde96cd5f6a28b6561404360241862c041b3.tar.bz2
Move webNavigation extension api into a separate directory
BUG=101244 TEST=none Review URL: https://chromiumcodereview.appspot.com/9959097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_service.cc')
-rw-r--r--chrome/browser/extensions/extension_service.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 1af45fd..c2e6101 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -37,6 +37,7 @@
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
+#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
#include "chrome/browser/extensions/default_apps_trial.h"
#include "chrome/browser/extensions/extension_browser_event_router.h"
#include "chrome/browser/extensions/extension_cookies_api.h"
@@ -56,7 +57,6 @@
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_system_factory.h"
#include "chrome/browser/extensions/extension_web_ui.h"
-#include "chrome/browser/extensions/extension_webnavigation_api.h"
#include "chrome/browser/extensions/external_extension_provider_impl.h"
#include "chrome/browser/extensions/external_extension_provider_interface.h"
#include "chrome/browser/extensions/installed_loader.h"
@@ -546,7 +546,7 @@ void ExtensionService::InitEventRouters() {
management_event_router_->Init();
ExtensionProcessesEventRouter::GetInstance()->ObserveProfile(profile_);
web_navigation_event_router_.reset(
- new ExtensionWebNavigationEventRouter(profile_));
+ new extensions::WebNavigationEventRouter(profile_));
web_navigation_event_router_->Init();
#if defined(OS_CHROMEOS)