Chromium Code Reviews| Index: chrome/browser/extensions/extension_service.cc |
| diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
| index 9a13fddc15158e7b23019347f2aeef15e3074a59..f93019974dc8c5a8d3961cf0eb202bcbe17f6f80 100644 |
| --- a/chrome/browser/extensions/extension_service.cc |
| +++ b/chrome/browser/extensions/extension_service.cc |
| @@ -49,6 +49,7 @@ |
| #include "chrome/browser/extensions/extension_input_ime_api.h" |
| #include "chrome/browser/extensions/extension_managed_mode_api.h" |
| #include "chrome/browser/extensions/extension_management_api.h" |
| +#include "chrome/browser/extensions/extension_panel_event_router.h" |
| #include "chrome/browser/extensions/extension_preference_api.h" |
| #include "chrome/browser/extensions/extension_process_manager.h" |
| #include "chrome/browser/extensions/extension_processes_api.h" |
| @@ -1160,6 +1161,16 @@ extensions::ExtensionUpdater* ExtensionService::updater() { |
| return updater_.get(); |
| } |
| +ExtensionPanelEventRouter* ExtensionService::GetPanelEventRouter() { |
|
stevenjb
2012/07/20 16:54:33
Shouldn't this be initialized (conditionally) in E
jennb
2012/07/20 18:09:37
Panel class uses the event router directly, thus a
|
| +#if defined(ENABLE_EXTENSIONS) |
| + if (CommandLine::ForCurrentProcess()->HasSwitch( |
| + switches::kBrowserlessPanels) && !panel_event_router_.get()) { |
|
jianli
2012/07/17 18:44:15
nit: It would be more efficient to check !panel_ev
|
| + panel_event_router_.reset(new ExtensionPanelEventRouter(profile_)); |
| + } |
| +#endif |
| + return panel_event_router_.get(); |
| +} |
| + |
| void ExtensionService::CheckAdminBlacklist() { |
| std::vector<std::string> to_be_removed; |
| // Loop through extensions list, unload installed extensions. |