diff options
| author | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 00:47:32 +0000 |
|---|---|---|
| committer | benwells@chromium.org <benwells@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-26 00:47:32 +0000 |
| commit | d1fe13594173c936db2383800499c3efb9ec693a (patch) | |
| tree | d617e05aa46bb1a00af37cb00c34dec6ade4cad4 /chrome/browser/tab_contents | |
| parent | abb842afad202c45897453ccc2370d1211935438 (diff) | |
| download | chromium_src-d1fe13594173c936db2383800499c3efb9ec693a.zip chromium_src-d1fe13594173c936db2383800499c3efb9ec693a.tar.gz chromium_src-d1fe13594173c936db2383800499c3efb9ec693a.tar.bz2 | |
Remove EPM:all_hosts_ and use all_extension_views_ instead.
EPM:all_hosts_ is used to look for extension render view hosts,
under the assumption it has all of them. This assumption is wrong,
and the name is confusing, so we're removing all_hosts_. A different
container can be used: all_extension_views, which contains
all the RenderViewHosts for extensions.
BUG=102617
TEST=Covered by existing tests
Review URL: http://codereview.chromium.org/10113005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/render_view_context_menu.cc | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 4251989..2c6d28f 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -24,9 +24,8 @@ #include "chrome/browser/download/download_service.h" #include "chrome/browser/download/download_service_factory.h" #include "chrome/browser/download/download_util.h" -#include "chrome/browser/extensions/extension_event_router.h" -#include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_service.h" +#include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/net/browser_url_util.h" #include "chrome/browser/prefs/incognito_mode_prefs.h" @@ -624,22 +623,13 @@ void RenderViewContextMenu::InitMenu() { } const Extension* RenderViewContextMenu::GetExtension() const { - ExtensionProcessManager* process_manager = - profile_->GetExtensionProcessManager(); + ExtensionSystem* system = ExtensionSystem::Get(profile_); // There is no process manager in some tests. - if (!process_manager) { + if (!system->process_manager()) return NULL; - } - - ExtensionProcessManager::const_iterator iter; - for (iter = process_manager->begin(); iter != process_manager->end(); - ++iter) { - ExtensionHost* host = *iter; - if (host->host_contents() == source_web_contents_) - return host->extension(); - } - return NULL; + return system->process_manager()->GetExtensionForRenderViewHost( + source_web_contents_->GetRenderViewHost()); } void RenderViewContextMenu::AppendPlatformAppItems( |