Index: extensions/browser/process_manager.cc |
diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc |
index 8b2b4b534b92e13bad3a2a9530c0f928c93eb284..6f4162b4efe150faaa2f75a916914e77cc29ed18 100644 |
--- a/extensions/browser/process_manager.cc |
+++ b/extensions/browser/process_manager.cc |
@@ -166,6 +166,7 @@ struct ProcessManager::ExtensionRenderFrameData { |
case VIEW_TYPE_APP_WINDOW: |
case VIEW_TYPE_BACKGROUND_CONTENTS: |
case VIEW_TYPE_EXTENSION_DIALOG: |
+ case VIEW_TYPE_EXTENSION_OPTIONS: |
case VIEW_TYPE_EXTENSION_POPUP: |
case VIEW_TYPE_LAUNCHER_PAGE: |
case VIEW_TYPE_PANEL: |
@@ -324,17 +325,10 @@ const ProcessManager::FrameSet ProcessManager::GetAllFrames() const { |
ProcessManager::FrameSet ProcessManager::GetRenderFrameHostsForExtension( |
const std::string& extension_id) { |
FrameSet result; |
- scoped_refptr<content::SiteInstance> site_instance(GetSiteInstanceForURL( |
- Extension::GetBaseURLFromExtensionId(extension_id))); |
- if (!site_instance.get()) |
- return result; |
- |
- // Gather up all the frames for that site. |
for (const auto& key_value : all_extension_frames_) { |
- if (key_value.first->GetSiteInstance() == site_instance) |
+ if (GetExtensionID(key_value.first) == extension_id) |
result.insert(key_value.first); |
} |
- |
return result; |
} |