diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 18:13:10 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-21 18:13:10 +0000 |
| commit | 3442353ac0781c716dfa21333d71d25ada4b5355 (patch) | |
| tree | 500dd7a6ba38f0b1cf991d92d8ba7ce1b771340b /chrome/browser/extensions/api | |
| parent | 9e1689818cda1878dc85da81bedeebac1c65ed18 (diff) | |
| download | chromium_src-3442353ac0781c716dfa21333d71d25ada4b5355.zip chromium_src-3442353ac0781c716dfa21333d71d25ada4b5355.tar.gz chromium_src-3442353ac0781c716dfa21333d71d25ada4b5355.tar.bz2 | |
Move EventRouter to src/extensions/browser
Now that its dependencies on Profile, ActivityLog, RuntimeAPI and
WebRequestAPI have been removed it can move into the extensions module.
This is part of the AppShell extensions refactoring project.
BUG=316367
TEST=compiles
R=yoz@chromium.org
TBR=mukai@chromium.org for mechanical file move in c/b/notifications, dmazzoni@chromium.org for mechanical file move in accessibility code
Review URL: https://codereview.chromium.org/78483003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236549 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api')
79 files changed, 79 insertions, 79 deletions
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h index a2bf60b..5dc496f 100644 --- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h +++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h @@ -14,7 +14,7 @@ #include "chrome/browser/extensions/activity_log/activity_log.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/alarms/alarm_manager.cc b/chrome/browser/extensions/api/alarms/alarm_manager.cc index 8bef9cc..582257c 100644 --- a/chrome/browser/extensions/api/alarms/alarm_manager.cc +++ b/chrome/browser/extensions/api/alarms/alarm_manager.cc @@ -14,13 +14,13 @@ #include "base/value_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/state_store.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/alarms.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc index 8feaa5c..1d988f9 100644 --- a/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc +++ b/chrome/browser/extensions/api/app_runtime/app_runtime_api.cc @@ -11,13 +11,13 @@ #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/app_runtime.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/audio/audio_api.cc b/chrome/browser/extensions/api/audio/audio_api.cc index 90415ae..2d0cd34 100644 --- a/chrome/browser/extensions/api/audio/audio_api.cc +++ b/chrome/browser/extensions/api/audio/audio_api.cc @@ -6,9 +6,9 @@ #include "base/lazy_instance.h" #include "base/values.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/audio.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc index af06d9a..88053e6 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.cc @@ -11,7 +11,6 @@ #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/bluetooth.h" @@ -24,6 +23,7 @@ #include "device/bluetooth/bluetooth_service_record.h" #include "device/bluetooth/bluetooth_socket.h" #include "device/bluetooth/bluetooth_utils.h" +#include "extensions/browser/event_router.h" #include "extensions/common/permissions/permissions_data.h" #include "net/base/io_buffer.h" diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h index 01dbe00..d914b42 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h @@ -11,10 +11,10 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/api_function.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "device/bluetooth/bluetooth_device.h" #include "device/bluetooth/bluetooth_profile.h" +#include "extensions/browser/event_router.h" namespace device { diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc index 1913ee4..a1757e7 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc @@ -15,7 +15,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_api_utils.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/bluetooth.h" #include "device/bluetooth/bluetooth_adapter.h" @@ -23,6 +22,7 @@ #include "device/bluetooth/bluetooth_device.h" #include "device/bluetooth/bluetooth_profile.h" #include "device/bluetooth/bluetooth_socket.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc index 39d3908..e4b463e 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_event_router_unittest.cc @@ -10,7 +10,6 @@ #include "base/run_loop.h" #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/common/extensions/api/bluetooth.h" @@ -20,6 +19,7 @@ #include "device/bluetooth/test/mock_bluetooth_device.h" #include "device/bluetooth/test/mock_bluetooth_profile.h" #include "device/bluetooth/test/mock_bluetooth_socket.h" +#include "extensions/browser/event_router.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index 0493a56..7a742ed 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -17,7 +17,6 @@ #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api_constants.h" #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_web_ui.h" @@ -30,6 +29,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_ui.h" +#include "extensions/browser/event_router.h" #include "extensions/browser/view_type_utils.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index f946556..446e84f 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -27,7 +27,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/bookmarks/bookmark_api_constants.h" #include "chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/importer/external_process_importer_host.h" @@ -44,6 +43,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/event_router.h" #include "extensions/browser/quota_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h index 641a409..62d91a3 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.h +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.h @@ -14,7 +14,7 @@ #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" +#include "extensions/browser/event_router.h" #include "ui/shell_dialogs/select_file_dialog.h" class Profile; diff --git a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h index b130e8a..111052f 100644 --- a/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h +++ b/chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h @@ -9,8 +9,8 @@ #include "chrome/browser/extensions/api/api_function.h" #include "chrome/browser/extensions/api/braille_display_private/braille_controller.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/common/extensions/api/braille_display_private.h" +#include "extensions/browser/event_router.h" namespace extensions { namespace api { diff --git a/chrome/browser/extensions/api/cast_channel/cast_channel_api.cc b/chrome/browser/extensions/api/cast_channel/cast_channel_api.cc index 8c770d5..9432171 100644 --- a/chrome/browser/extensions/api/cast_channel/cast_channel_api.cc +++ b/chrome/browser/extensions/api/cast_channel/cast_channel_api.cc @@ -9,11 +9,11 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/cast_channel/cast_socket.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/net/chrome_net_log.h" #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/event_router.h" #include "net/base/net_errors.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index b26a9ea..d0477e0 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -18,7 +18,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/cookies/cookies_api_constants.h" #include "chrome/browser/extensions/api/cookies/cookies_helpers.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -26,6 +25,7 @@ #include "chrome/common/extensions/api/cookies.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/event_router.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" diff --git a/chrome/browser/extensions/api/cookies/cookies_api.h b/chrome/browser/extensions/api/cookies/cookies_api.h index 551a2be..c4cbc88 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.h +++ b/chrome/browser/extensions/api/cookies/cookies_api.h @@ -15,11 +15,11 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/net/chrome_cookie_notification_details.h" #include "chrome/common/extensions/api/cookies.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/event_router.h" #include "net/cookies/canonical_cookie.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 44769c10..f26bab3 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -21,7 +21,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/devtools/devtools_target_impl.h" #include "chrome/browser/extensions/api/debugger/debugger_api_constants.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" @@ -44,6 +43,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" #include "content/public/common/url_utils.h" +#include "extensions/browser/event_router.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.h b/chrome/browser/extensions/api/developer_private/developer_private_api.h index e5f0721..4af2eec 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.h +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.h @@ -9,7 +9,6 @@ #include "chrome/browser/extensions/api/developer_private/entry_picker.h" #include "chrome/browser/extensions/api/file_system/file_system_api.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "chrome/browser/extensions/pack_extension_job.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/event_router.h" #include "ui/shell_dialogs/select_file_dialog.h" #include "webkit/browser/fileapi/file_system_context.h" #include "webkit/browser/fileapi/file_system_operation.h" diff --git a/chrome/browser/extensions/api/dial/dial_api.cc b/chrome/browser/extensions/api/dial/dial_api.cc index 9b4b1f3..c5416d2 100644 --- a/chrome/browser/extensions/api/dial/dial_api.cc +++ b/chrome/browser/extensions/api/dial/dial_api.cc @@ -8,11 +8,11 @@ #include "base/time/time.h" #include "chrome/browser/extensions/api/dial/dial_api_factory.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/dial.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/event_router.h" using base::TimeDelta; using content::BrowserThread; diff --git a/chrome/browser/extensions/api/dial/dial_api.h b/chrome/browser/extensions/api/dial/dial_api.h index 74e284e..d1481ca 100644 --- a/chrome/browser/extensions/api/dial/dial_api.h +++ b/chrome/browser/extensions/api/dial/dial_api.h @@ -10,8 +10,8 @@ #include "chrome/browser/extensions/api/api_function.h" #include "chrome/browser/extensions/api/dial/dial_device_data.h" #include "chrome/browser/extensions/api/dial/dial_registry.h" -#include "chrome/browser/extensions/event_router.h" #include "components/browser_context_keyed_service/refcounted_browser_context_keyed_service.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index ded4aa8..999b2a1 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -38,7 +38,6 @@ #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/download/download_stats.h" #include "chrome/browser/download/drag_download_item.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" @@ -71,6 +70,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/browser/web_contents_view.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/browser/extensions/api/downloads/downloads_api.h index 5542058..6a9fee9 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.h +++ b/chrome/browser/extensions/api/downloads/downloads_api.h @@ -16,13 +16,13 @@ #include "chrome/browser/download/download_danger_prompt.h" #include "chrome/browser/download/download_path_reservation_tracker.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_warning_set.h" #include "chrome/common/extensions/api/downloads.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/event_router.h" class DownloadFileIconExtractor; class DownloadQuery; diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc index c041ce23..5c7b068 100644 --- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc +++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc @@ -11,7 +11,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_action_manager.h" #include "chrome/browser/extensions/extension_function_registry.h" @@ -28,6 +27,7 @@ #include "chrome/common/render_messages.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/event_router.h" #include "extensions/common/error_utils.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc index 82c2137..11fef26 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_browsertest.cc @@ -9,7 +9,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/feedback_private/feedback_private_api.h" #include "chrome/browser/extensions/component_loader.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -18,6 +17,7 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/common/content_switches.h" +#include "extensions/browser/event_router.h" using apps::ShellWindow; using apps::ShellWindowRegistry; diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc index 1888ffb..c8698d4 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc @@ -11,9 +11,9 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/api/feedback_private/feedback_service.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/feedback/tracing_manager.h" +#include "extensions/browser/event_router.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.h b/chrome/browser/extensions/api/font_settings/font_settings_api.h index 497ee35..3b0f537 100644 --- a/chrome/browser/extensions/api/font_settings/font_settings_api.h +++ b/chrome/browser/extensions/api/font_settings/font_settings_api.h @@ -15,7 +15,7 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" +#include "extensions/browser/event_router.h" class Profile; diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc index 9bbb36f..e55b726 100644 --- a/chrome/browser/extensions/api/history/history_api.cc +++ b/chrome/browser/extensions/api/history/history_api.cc @@ -19,7 +19,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/activity_log/activity_log.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/history/history_service.h" #include "chrome/browser/history/history_service_factory.h" @@ -33,6 +32,7 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/history/history_api.h b/chrome/browser/extensions/api/history/history_api.h index 2106949..65a4736 100644 --- a/chrome/browser/extensions/api/history/history_api.h +++ b/chrome/browser/extensions/api/history/history_api.h @@ -12,12 +12,12 @@ #include "base/memory/linked_ptr.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/history/history_notifications.h" #include "chrome/browser/history/history_service.h" #include "chrome/common/cancelable_task_tracker.h" #include "chrome/common/extensions/api/history.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/event_router.h" namespace base { class ListValue; diff --git a/chrome/browser/extensions/api/identity/identity_api.cc b/chrome/browser/extensions/api/identity/identity_api.cc index 5955853..650f250 100644 --- a/chrome/browser/extensions/api/identity/identity_api.cc +++ b/chrome/browser/extensions/api/identity/identity_api.cc @@ -17,7 +17,6 @@ #include "chrome/browser/app_mode/app_mode_utils.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" @@ -30,6 +29,7 @@ #include "chrome/common/extensions/api/identity/oauth2_manifest_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "google_apis/gaia/gaia_urls.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc index 92a0b5a..eb61068 100644 --- a/chrome/browser/extensions/api/identity/web_auth_flow.cc +++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc @@ -11,7 +11,6 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/component_loader.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system.h" @@ -28,6 +27,7 @@ #include "content/public/browser/resource_request_details.h" #include "content/public/browser/web_contents.h" #include "crypto/random.h" +#include "extensions/browser/event_router.h" #include "grit/browser_resources.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/api/idle/idle_api_unittest.cc b/chrome/browser/extensions/api/idle/idle_api_unittest.cc index 7b44f07..e6655be 100644 --- a/chrome/browser/extensions/api/idle/idle_api_unittest.cc +++ b/chrome/browser/extensions/api/idle/idle_api_unittest.cc @@ -12,12 +12,12 @@ #include "chrome/browser/extensions/api/idle/idle_api_constants.h" #include "chrome/browser/extensions/api/idle/idle_manager.h" #include "chrome/browser/extensions/api/idle/idle_manager_factory.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/common/extensions/api/idle.h" #include "chrome/test/base/browser_with_test_window_test.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/idle/idle_manager.cc b/chrome/browser/extensions/api/idle/idle_manager.cc index 461bca1..d3726a7 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.cc +++ b/chrome/browser/extensions/api/idle/idle_manager.cc @@ -9,13 +9,13 @@ #include "base/stl_util.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/idle/idle_api_constants.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/idle.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" namespace keys = extensions::idle_api_constants; diff --git a/chrome/browser/extensions/api/idle/idle_manager.h b/chrome/browser/extensions/api/idle/idle_manager.h index 91108c2..a300dba 100644 --- a/chrome/browser/extensions/api/idle/idle_manager.h +++ b/chrome/browser/extensions/api/idle/idle_manager.h @@ -13,11 +13,11 @@ #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/idle.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/event_router.h" namespace base { class StringValue; diff --git a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc index c6d8c85..8d892ea 100644 --- a/chrome/browser/extensions/api/image_writer_private/operation_manager.cc +++ b/chrome/browser/extensions/api/image_writer_private/operation_manager.cc @@ -10,7 +10,6 @@ #include "chrome/browser/extensions/api/image_writer_private/operation_manager.h" #include "chrome/browser/extensions/api/image_writer_private/write_from_file_operation.h" #include "chrome/browser/extensions/api/image_writer_private/write_from_url_operation.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/event_router_forwarder.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" @@ -18,6 +17,7 @@ #include "chrome/browser/extensions/extension_system_factory.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/event_router.h" namespace image_writer_api = extensions::api::image_writer_private; diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc index 5a938b9..3690b26 100644 --- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc +++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc @@ -8,7 +8,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/chromeos/input_method/input_method_engine.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -16,6 +15,7 @@ #include "chrome/common/extensions/api/input_ime/input_components_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/event_router.h" namespace input_ime = extensions::api::input_ime; namespace KeyEventHandled = extensions::api::input_ime::KeyEventHandled; diff --git a/chrome/browser/extensions/api/location/location_manager.cc b/chrome/browser/extensions/api/location/location_manager.cc index 5cd2290..2b57845 100644 --- a/chrome/browser/extensions/api/location/location_manager.cc +++ b/chrome/browser/extensions/api/location/location_manager.cc @@ -11,7 +11,6 @@ #include "base/lazy_instance.h" #include "base/time/time.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/location.h" #include "content/public/browser/browser_thread.h" @@ -19,6 +18,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/common/geoposition.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc index 28b3bdc..8b889c7 100644 --- a/chrome/browser/extensions/api/management/management_api.cc +++ b/chrome/browser/extensions/api/management/management_api.cc @@ -21,7 +21,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/management/management_api_constants.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" @@ -40,6 +39,7 @@ #include "content/public/browser/notification_source.h" #include "content/public/browser/utility_process_host.h" #include "content/public/browser/utility_process_host_client.h" +#include "extensions/browser/event_router.h" #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" diff --git a/chrome/browser/extensions/api/management/management_api.h b/chrome/browser/extensions/api/management/management_api.h index 1dcde84..f8cc7e6 100644 --- a/chrome/browser/extensions/api/management/management_api.h +++ b/chrome/browser/extensions/api/management/management_api.h @@ -8,12 +8,12 @@ #include "base/compiler_specific.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_uninstall_dialog.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/event_router.h" class ExtensionService; class ExtensionUninstallDialog; diff --git a/chrome/browser/extensions/api/mdns/mdns_api.h b/chrome/browser/extensions/api/mdns/mdns_api.h index 851e0b9..dabf325 100644 --- a/chrome/browser/extensions/api/mdns/mdns_api.h +++ b/chrome/browser/extensions/api/mdns/mdns_api.h @@ -12,7 +12,7 @@ #include "base/threading/thread_checker.h" #include "chrome/browser/extensions/api/mdns/dns_sd_registry.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" -#include "chrome/browser/extensions/event_router.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc index f5386fd..bed03c0 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.cc @@ -15,7 +15,6 @@ #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_manager.h" #include "chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" @@ -26,6 +25,7 @@ #include "chrome/common/extensions/api/media_galleries_private/media_galleries_handler.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/event_router.h" #include "extensions/browser/extension_function.h" using base::DictionaryValue; diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h index 129296f..a0e745e 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_api.h @@ -13,9 +13,9 @@ #include "chrome/browser/extensions/api/media_galleries_private/gallery_watch_state_tracker.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/media_galleries/media_galleries_preferences.h" #include "chrome/common/extensions/api/media_galleries_private.h" +#include "extensions/browser/event_router.h" class Profile; diff --git a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc index e2a0367..b924116 100644 --- a/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc +++ b/chrome/browser/extensions/api/media_galleries_private/media_galleries_private_event_router.cc @@ -11,12 +11,12 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/storage_monitor/storage_monitor.h" #include "chrome/common/extensions/api/media_galleries_private.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/event_router.h" namespace media_galleries_private = extensions::api::media_galleries_private; diff --git a/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc b/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc index 03fcd4c..4c717e5 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc +++ b/chrome/browser/extensions/api/networking_private/networking_private_api_nonchromeos.cc @@ -10,12 +10,12 @@ #include "base/command_line.h" #include "base/json/json_reader.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/api/networking_private.h" +#include "extensions/browser/event_router.h" using extensions::EventRouter; using extensions::ExtensionSystem; diff --git a/chrome/browser/extensions/api/networking_private/networking_private_event_router.h b/chrome/browser/extensions/api/networking_private/networking_private_event_router.h index 011c8dd..442db09 100644 --- a/chrome/browser/extensions/api/networking_private/networking_private_event_router.h +++ b/chrome/browser/extensions/api/networking_private/networking_private_event_router.h @@ -5,9 +5,9 @@ #ifndef CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_EVENT_ROUTER_H_ #define CHROME_BROWSER_EXTENSIONS_API_NETWORKING_PRIVATE_NETWORKING_PRIVATE_EVENT_ROUTER_H_ -#include "chrome/browser/extensions/event_router.h" #include "chromeos/network/network_state_handler_observer.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "extensions/browser/event_router.h" class Profile; diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc index 64af8b0..79fb5c7 100644 --- a/chrome/browser/extensions/api/notifications/notifications_api.cc +++ b/chrome/browser/extensions/api/notifications/notifications_api.cc @@ -12,7 +12,6 @@ #include "base/time/time.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/desktop_notification_service_factory.h" @@ -21,6 +20,7 @@ #include "chrome/common/chrome_version_info.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc index 3e97382..85df2cf 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc @@ -11,7 +11,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" @@ -24,6 +23,7 @@ #include "chrome/common/extensions/api/omnibox/omnibox_handler.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h index 4d5e9ff..1acb3a5e 100644 --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.h @@ -7,7 +7,7 @@ #include "base/prefs/pref_change_registrar.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" -#include "chrome/browser/extensions/event_router.h" +#include "extensions/browser/event_router.h" class Profile; diff --git a/chrome/browser/extensions/api/preference/preference_api.h b/chrome/browser/extensions/api/preference/preference_api.h index b924126..313fdc2 100644 --- a/chrome/browser/extensions/api/preference/preference_api.h +++ b/chrome/browser/extensions/api/preference/preference_api.h @@ -11,8 +11,8 @@ #include "chrome/browser/extensions/api/content_settings/content_settings_store.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "content/public/browser/notification_observer.h" +#include "extensions/browser/event_router.h" #include "extensions/browser/extension_prefs_scope.h" class ExtensionPrefValueMap; diff --git a/chrome/browser/extensions/api/preference/preference_helpers.cc b/chrome/browser/extensions/api/preference/preference_helpers.cc index b2d7eb0..c0235ab 100644 --- a/chrome/browser/extensions/api/preference/preference_helpers.cc +++ b/chrome/browser/extensions/api/preference/preference_helpers.cc @@ -8,12 +8,12 @@ #include "base/prefs/pref_service.h" #include "base/values.h" #include "chrome/browser/extensions/api/preference/preference_api.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" +#include "extensions/browser/event_router.h" #include "extensions/common/manifest_handlers/incognito_info.h" namespace extensions { diff --git a/chrome/browser/extensions/api/processes/processes_api.cc b/chrome/browser/extensions/api/processes/processes_api.cc index 16e423b..1d304d9 100644 --- a/chrome/browser/extensions/api/processes/processes_api.cc +++ b/chrome/browser/extensions/api/processes/processes_api.cc @@ -15,7 +15,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/processes/processes_api_constants.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_function_util.h" #include "chrome/browser/extensions/extension_service.h" @@ -34,6 +33,7 @@ #include "content/public/browser/render_widget_host_iterator.h" #include "content/public/browser/web_contents.h" #include "content/public/common/result_codes.h" +#include "extensions/browser/event_router.h" #include "extensions/common/error_utils.h" namespace extensions { diff --git a/chrome/browser/extensions/api/processes/processes_api.h b/chrome/browser/extensions/api/processes/processes_api.h index 85455f9..8468883 100644 --- a/chrome/browser/extensions/api/processes/processes_api.h +++ b/chrome/browser/extensions/api/processes/processes_api.h @@ -11,12 +11,12 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/task_manager/task_manager.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_widget_host.h" +#include "extensions/browser/event_router.h" class Profile; diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc index c77f667..6c7b0e9 100644 --- a/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc +++ b/chrome/browser/extensions/api/push_messaging/push_messaging_api.cc @@ -13,7 +13,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_system_factory.h" @@ -30,6 +29,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/api_permission.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/extensions/api/runtime/runtime_api.cc b/chrome/browser/extensions/api/runtime/runtime_api.cc index 7711d6bc..9a5c475 100644 --- a/chrome/browser/extensions/api/runtime/runtime_api.cc +++ b/chrome/browser/extensions/api/runtime/runtime_api.cc @@ -11,7 +11,6 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" @@ -27,6 +26,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" +#include "extensions/browser/event_router.h" #include "extensions/browser/extensions_browser_client.h" #include "extensions/browser/lazy_background_task_queue.h" #include "extensions/browser/process_manager.h" diff --git a/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc b/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc index 5d475c2..563ebfb 100644 --- a/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc +++ b/chrome/browser/extensions/api/serial/serial_event_dispatcher.cc @@ -6,10 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/serial/serial_connection.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc index 9d5e450..a48a3d6 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc @@ -14,7 +14,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -27,6 +26,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" using browser_sync::DeviceInfo; diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h index d03325e..ea4a5f1 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h @@ -10,8 +10,8 @@ #include "base/gtest_prod_util.h" #include "base/memory/scoped_vector.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/sync/glue/synced_device_tracker.h" +#include "extensions/browser/event_router.h" class Profile; namespace content { diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc index 59905a9..02b6e94 100644 --- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc +++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc @@ -6,11 +6,11 @@ #include "base/prefs/pref_service.h" #include "base/prefs/testing_pref_store.h" #include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/extensions/api/signed_in_devices.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/browser/event_router.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.cc b/chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.cc index 40d8c22..ced1575 100644 --- a/chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.cc +++ b/chrome/browser/extensions/api/sockets_tcp/tcp_socket_event_dispatcher.cc @@ -6,10 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/socket/tcp_socket.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "extensions/browser/event_router.h" #include "net/base/net_errors.h" namespace { diff --git a/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc b/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc index d849e8c..faf4a05 100644 --- a/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc +++ b/chrome/browser/extensions/api/sockets_tcp_server/tcp_server_socket_event_dispatcher.cc @@ -6,10 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/socket/tcp_socket.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "extensions/browser/event_router.h" #include "net/base/net_errors.h" namespace extensions { diff --git a/chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc b/chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc index 1f67872..6b4a518 100644 --- a/chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc +++ b/chrome/browser/extensions/api/sockets_udp/udp_socket_event_dispatcher.cc @@ -6,10 +6,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/api/socket/udp_socket.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "extensions/browser/event_router.h" #include "net/base/net_errors.h" namespace extensions { diff --git a/chrome/browser/extensions/api/storage/settings_frontend.cc b/chrome/browser/extensions/api/storage/settings_frontend.cc index 86f4262..2a48bf3 100644 --- a/chrome/browser/extensions/api/storage/settings_frontend.cc +++ b/chrome/browser/extensions/api/storage/settings_frontend.cc @@ -14,12 +14,12 @@ #include "chrome/browser/extensions/api/storage/settings_backend.h" #include "chrome/browser/extensions/api/storage/sync_or_local_value_store_cache.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/storage.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/event_router.h" #if defined(ENABLE_CONFIGURATION_POLICY) #include "chrome/browser/extensions/api/storage/managed_value_store_cache.h" diff --git a/chrome/browser/extensions/api/storage/settings_test_util.h b/chrome/browser/extensions/api/storage/settings_test_util.h index e801dd1..e4d3ea2 100644 --- a/chrome/browser/extensions/api/storage/settings_test_util.h +++ b/chrome/browser/extensions/api/storage/settings_test_util.h @@ -14,11 +14,11 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/storage/settings_namespace.h" #include "chrome/browser/extensions/api/storage/settings_storage_factory.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/test_extension_service.h" #include "chrome/browser/extensions/test_extension_system.h" #include "chrome/test/base/testing_profile.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" class ValueStore; diff --git a/chrome/browser/extensions/api/streams_private/streams_private_api.cc b/chrome/browser/extensions/api/streams_private/streams_private_api.cc index 61fceb2..d76f24b 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_api.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_api.cc @@ -10,7 +10,6 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_function_registry.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" @@ -18,6 +17,7 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/stream_handle.h" +#include "extensions/browser/event_router.h" namespace events { diff --git a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc index 723793a..5bc5790 100644 --- a/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc +++ b/chrome/browser/extensions/api/streams_private/streams_private_apitest.cc @@ -6,7 +6,6 @@ #include "base/message_loop/message_loop.h" #include "base/prefs/pref_service.h" #include "chrome/browser/download/download_prefs.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -22,6 +21,7 @@ #include "content/public/browser/resource_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/test/download_test_observer.h" +#include "extensions/browser/event_router.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/http_request.h" #include "net/test/embedded_test_server/http_response.h" diff --git a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc index af647fa..df7fe59 100644 --- a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc +++ b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc @@ -6,7 +6,6 @@ #include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h" #include "chrome/browser/extensions/event_names.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" @@ -14,6 +13,7 @@ #include "chrome/browser/sync_file_system/sync_file_system_service.h" #include "chrome/browser/sync_file_system/syncable_file_system_util.h" #include "chrome/common/extensions/api/sync_file_system.h" +#include "extensions/browser/event_router.h" #include "webkit/browser/fileapi/file_system_url.h" #include "webkit/common/fileapi/file_system_util.h" diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc index b68bcc4..f6bdc3e 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.cc @@ -7,7 +7,6 @@ #include "base/memory/linked_ptr.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_action.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" @@ -18,6 +17,7 @@ #include "chrome/common/extensions/api/system_indicator.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h index a2e403f..f7b8e75 100644 --- a/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h +++ b/chrome/browser/extensions/api/system_indicator/system_indicator_manager.h @@ -10,11 +10,11 @@ #include "base/memory/linked_ptr.h" #include "base/threading/thread_checker.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_action_icon_factory.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/event_router.h" class ExtensionAction; class Profile; diff --git a/chrome/browser/extensions/api/system_info/system_info_api.h b/chrome/browser/extensions/api/system_info/system_info_api.h index 3fbb7fa..d262546 100644 --- a/chrome/browser/extensions/api/system_info/system_info_api.h +++ b/chrome/browser/extensions/api/system_info/system_info_api.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_SYSTEM_INFO_API_H_ #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" -#include "chrome/browser/extensions/event_router.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc index a819b37..7f0af85 100644 --- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc +++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc @@ -6,7 +6,6 @@ #include "base/lazy_instance.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/fullscreen/fullscreen_controller.h" @@ -18,6 +17,7 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" +#include "extensions/browser/event_router.h" #include "extensions/common/extension.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.h b/chrome/browser/extensions/api/tabs/tabs_event_router.h index 1c95f7a..b7f911c 100644 --- a/chrome/browser/extensions/api/tabs/tabs_event_router.h +++ b/chrome/browser/extensions/api/tabs/tabs_event_router.h @@ -11,10 +11,10 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "chrome/browser/extensions/api/tabs/tabs_api.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" #include "content/public/browser/notification_registrar.h" +#include "extensions/browser/event_router.h" namespace content { class WebContents; diff --git a/chrome/browser/extensions/api/tabs/tabs_windows_api.cc b/chrome/browser/extensions/api/tabs/tabs_windows_api.cc index 605a710..604d67d 100644 --- a/chrome/browser/extensions/api/tabs/tabs_windows_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_windows_api.cc @@ -7,10 +7,10 @@ #include "base/lazy_instance.h" #include "chrome/browser/extensions/api/tabs/tabs_event_router.h" #include "chrome/browser/extensions/api/tabs/windows_event_router.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/common/extensions/api/tabs.h" #include "chrome/common/extensions/api/windows.h" +#include "extensions/browser/event_router.h" namespace extensions { diff --git a/chrome/browser/extensions/api/tabs/tabs_windows_api.h b/chrome/browser/extensions/api/tabs/tabs_windows_api.h index 7f8873e..cba5874 100644 --- a/chrome/browser/extensions/api/tabs/tabs_windows_api.h +++ b/chrome/browser/extensions/api/tabs/tabs_windows_api.h @@ -7,8 +7,8 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" -#include "chrome/browser/extensions/event_router.h" #include "components/browser_context_keyed_service/browser_context_keyed_service.h" +#include "extensions/browser/event_router.h" namespace extensions { class TabsEventRouter; diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.cc b/chrome/browser/extensions/api/tabs/windows_event_router.cc index 6468774..e6d55fc 100644 --- a/chrome/browser/extensions/api/tabs/windows_event_router.cc +++ b/chrome/browser/extensions/api/tabs/windows_event_router.cc @@ -6,7 +6,6 @@ #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_util.h" @@ -16,6 +15,7 @@ #include "chrome/common/extensions/api/windows.h" #include "chrome/common/extensions/extension_constants.h" #include "content/public/browser/notification_service.h" +#include "extensions/browser/event_router.h" #if defined(TOOLKIT_GTK) #include "ui/base/x/active_window_watcher_x.h" diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc index 5ac2492..e183c56 100644 --- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc +++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc @@ -9,13 +9,13 @@ #include "base/sys_info.h" #include "base/values.h" #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/api/terminal_private.h" #include "chromeos/process_proxy/process_proxy_registry.h" #include "content/public/browser/browser_thread.h" +#include "extensions/browser/event_router.h" namespace terminal_private = extensions::api::terminal_private; namespace OnTerminalResize = diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc index f4ecce5..839b4b6 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc @@ -10,7 +10,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" @@ -27,6 +26,7 @@ #include "content/public/browser/resource_request_details.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" +#include "extensions/browser/event_router.h" #include "extensions/browser/view_type_utils.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h index 00f17fe..1f3e357 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.h +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.h @@ -15,7 +15,6 @@ #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/api/web_navigation/frame_navigation_state.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser_list_observer.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" @@ -23,6 +22,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/browser/web_contents_user_data.h" +#include "extensions/browser/event_router.h" #include "url/gurl.h" struct RetargetingDetails; diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc index bb1ae8e..fe11eef 100644 --- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc +++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc @@ -11,7 +11,6 @@ #include "base/time/time.h" #include "base/values.h" #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "chrome/browser/profiles/profile.h" @@ -19,6 +18,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/event_router.h" #include "extensions/common/event_filtering_info.h" #include "net/base/net_errors.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index d0a7237..500d885 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -30,7 +30,6 @@ #include "chrome/browser/extensions/api/web_request/web_request_api_constants.h" #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/browser/extensions/api/web_request/web_request_time_tracker.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_renderer_state.h" #include "chrome/browser/extensions/extension_service.h" @@ -49,6 +48,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/resource_request_info.h" #include "content/public/browser/user_metrics.h" +#include "extensions/browser/event_router.h" #include "extensions/browser/info_map.h" #include "extensions/common/error_utils.h" #include "extensions/common/event_filtering_info.h" diff --git a/chrome/browser/extensions/api/web_request/web_request_api.h b/chrome/browser/extensions/api/web_request/web_request_api.h index d46fe9d..e9d434a 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.h +++ b/chrome/browser/extensions/api/web_request/web_request_api.h @@ -19,7 +19,7 @@ #include "chrome/browser/extensions/api/profile_keyed_api_factory.h" #include "chrome/browser/extensions/api/web_request/web_request_api_helpers.h" #include "chrome/browser/extensions/api/web_request/web_request_permissions.h" -#include "chrome/browser/extensions/event_router.h" +#include "extensions/browser/event_router.h" #include "extensions/browser/extension_function.h" #include "extensions/common/url_pattern_set.h" #include "ipc/ipc_sender.h" diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc index 971dfe6..48b0921 100644 --- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc +++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc @@ -9,11 +9,11 @@ #include "base/strings/string_number_conversions.h" #include "base/task_runner_util.h" #include "chrome/browser/extensions/api/tabs/tabs_constants.h" -#include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_tab_util.h" #include "content/public/browser/media_device_id.h" #include "content/public/browser/web_contents.h" +#include "extensions/browser/event_router.h" #include "extensions/common/error_utils.h" #include "media/audio/audio_manager_base.h" #include "media/audio/audio_output_controller.h" |