diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 05:06:09 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 05:06:09 +0000 |
| commit | c5dbef0ce4b8279cb14ce5516a1f67f6543f5283 (patch) | |
| tree | 036a5d68df14f300c6549286daceccb0a3ad4159 /chrome/browser/extensions/extensions_ui.cc | |
| parent | 42aec6de361b66396e60725353adc477948d6a43 (diff) | |
| download | chromium_src-c5dbef0ce4b8279cb14ce5516a1f67f6543f5283.zip chromium_src-c5dbef0ce4b8279cb14ce5516a1f67f6543f5283.tar.gz chromium_src-c5dbef0ce4b8279cb14ce5516a1f67f6543f5283.tar.bz2 | |
Re-land r84928: Move EFD to ExtensionTabHelper.
BUG=80308
TBR=mpcomplete@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extensions_ui.cc')
| -rw-r--r-- | chrome/browser/extensions/extensions_ui.cc | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 8022dc4..37e4fd9 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -20,7 +20,6 @@ #include "chrome/browser/extensions/crx_installer.h" #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" #include "chrome/browser/extensions/extension_error_reporter.h" -#include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extension_service.h" @@ -300,13 +299,11 @@ void ExtensionsDOMHandler::RegisterForNotifications() { NotificationService::AllSources()); registrar_.Add(this, NotificationType::EXTENSION_UPDATE_DISABLED, NotificationService::AllSources()); - registrar_.Add(this, NotificationType::EXTENSION_FUNCTION_DISPATCHER_CREATED, - NotificationService::AllSources()); registrar_.Add(this, - NotificationType::EXTENSION_FUNCTION_DISPATCHER_DESTROYED, + NotificationType::NAV_ENTRY_COMMITTED, NotificationService::AllSources()); registrar_.Add(this, - NotificationType::NAV_ENTRY_COMMITTED, + NotificationType::RENDER_VIEW_HOST_CREATED, NotificationService::AllSources()); registrar_.Add(this, NotificationType::RENDER_VIEW_HOST_DELETED, @@ -631,9 +628,11 @@ void ExtensionsDOMHandler::Observe(NotificationType type, // we don't know about the views for an extension at EXTENSION_LOADED, but // if we only listen to EXTENSION_PROCESS_CREATED, we'll miss extensions // that don't have a process at startup. Similarly, NAV_ENTRY_COMMITTED & - // EXTENSION_FUNCTION_DISPATCHER_CREATED because we want to handle both - // the case of live app pages (which don't have an EFD) and - // chrome-extension:// urls which are served in a TabContents. + // RENDER_VIEW_HOST_CREATED because we want to handle both + // the case of navigating from a non-extension page to an extension page in + // a TabContents (which will generate NAV_ENTRY_COMMITTED) as well as + // extension content being shown in popups and balloons (which will generate + // RENDER_VIEW_HOST_CREATED but no NAV_ENTRY_COMMITTED). // // Doing it this way gets everything but causes the page to be rendered // more than we need. It doesn't seem to result in any noticeable flicker. @@ -649,8 +648,7 @@ void ExtensionsDOMHandler::Observe(NotificationType type, case NotificationType::EXTENSION_PROCESS_CREATED: case NotificationType::EXTENSION_UNLOADED: case NotificationType::EXTENSION_UPDATE_DISABLED: - case NotificationType::EXTENSION_FUNCTION_DISPATCHER_CREATED: - case NotificationType::EXTENSION_FUNCTION_DISPATCHER_DESTROYED: + case NotificationType::RENDER_VIEW_HOST_CREATED: case NotificationType::NAV_ENTRY_COMMITTED: case NotificationType::BACKGROUND_CONTENTS_NAVIGATED: case NotificationType::EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED: |