diff options
| -rw-r--r-- | chrome/browser/extensions/extension_bookmarks_module.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/extensions/extensions_service.cc | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/extensions/extension_bookmarks_module.cc index fe19d67..0029702 100644 --- a/chrome/browser/extensions/extension_bookmarks_module.cc +++ b/chrome/browser/extensions/extension_bookmarks_module.cc @@ -100,8 +100,6 @@ class ExtensionBookmarks { }; void BookmarksFunction::Run() { - // TODO(erikkay) temporary hack until adding an event listener can notify the - // browser. BookmarkModel* model = profile()->GetBookmarkModel(); if (!model->IsLoaded()) { // Bookmarks are not ready yet. We'll wait. @@ -111,9 +109,6 @@ void BookmarksFunction::Run() { return; } - ExtensionBookmarkEventRouter* event_router = - ExtensionBookmarkEventRouter::GetSingleton(); - event_router->Observe(model); bool success = RunImpl(); if (success) { NotificationService::current()->Notify( diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc index c254b92..b185150 100644 --- a/chrome/browser/extensions/extensions_service.cc +++ b/chrome/browser/extensions/extensions_service.cc @@ -14,6 +14,7 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/extensions/crx_installer.h" +#include "chrome/browser/extensions/extension_bookmarks_module.h" #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_dom_ui.h" #include "chrome/browser/extensions/extension_file_util.h" @@ -588,6 +589,10 @@ void ExtensionsService::OnExtensionLoaded(Extension* extension, if (extension->HasApiPermission(Extension::kTabPermission)) { ExtensionBrowserEventRouter::GetInstance()->Init(); } + if (extension->HasApiPermission(Extension::kBookmarkPermission)) { + ExtensionBookmarkEventRouter::GetSingleton()->Observe( + profile_->GetBookmarkModel()); + } if (extension->location() != Extension::LOAD) extension_prefs_->MigrateToPrefs(extension); |