Index: extensions/renderer/dispatcher.h |
diff --git a/extensions/renderer/dispatcher.h b/extensions/renderer/dispatcher.h |
index 3fd560b2ef44a8ce9131b736bba3172df0ad1930..418f4065cc736f630ae703c6b03ca9906c82f713 100644 |
--- a/extensions/renderer/dispatcher.h |
+++ b/extensions/renderer/dispatcher.h |
@@ -90,11 +90,13 @@ class Dispatcher : public content::RenderProcessObserver, |
bool IsExtensionActive(const std::string& extension_id) const; |
- // Finds the extension ID for the JavaScript context associated with the |
+ // Finds the extension for the JavaScript context associated with the |
// specified |frame| and isolated world. If |world_id| is zero, finds the |
// extension ID associated with the main world's JavaScript context. If the |
// JavaScript context isn't from an extension, returns empty string. |
- std::string GetExtensionID(const blink::WebFrame* frame, int world_id); |
+ const Extension* GetExtensionFromFrameAndWorld(const blink::WebFrame* frame, |
+ int world_id, |
+ bool use_effective_url); |
void DidCreateScriptContext(blink::WebFrame* frame, |
const v8::Handle<v8::Context>& context, |