| Index: chrome/renderer/extensions/dispatcher.h
|
| diff --git a/chrome/renderer/extensions/dispatcher.h b/chrome/renderer/extensions/dispatcher.h
|
| index a42a604a891755ae37dd365d022da50352f218ec..1501614f6a54233123a38d765de49c64124997be 100644
|
| --- a/chrome/renderer/extensions/dispatcher.h
|
| +++ b/chrome/renderer/extensions/dispatcher.h
|
| @@ -32,7 +32,7 @@ class URLPattern;
|
| struct ExtensionMsg_ExternalConnectionInfo;
|
| struct ExtensionMsg_Loaded_Params;
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebFrame;
|
| class WebSecurityOrigin;
|
| }
|
| @@ -89,22 +89,22 @@ class Dispatcher : public content::RenderProcessObserver {
|
| // 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 WebKit::WebFrame* frame, int world_id);
|
| + std::string GetExtensionID(const blink::WebFrame* frame, int world_id);
|
|
|
| - void DidCreateScriptContext(WebKit::WebFrame* frame,
|
| + void DidCreateScriptContext(blink::WebFrame* frame,
|
| v8::Handle<v8::Context> context,
|
| int extension_group,
|
| int world_id);
|
| - void WillReleaseScriptContext(WebKit::WebFrame* frame,
|
| + void WillReleaseScriptContext(blink::WebFrame* frame,
|
| v8::Handle<v8::Context> context,
|
| int world_id);
|
|
|
| - void DidCreateDocumentElement(WebKit::WebFrame* frame);
|
| + void DidCreateDocumentElement(blink::WebFrame* frame);
|
|
|
| void DidMatchCSS(
|
| - WebKit::WebFrame* frame,
|
| - const WebKit::WebVector<WebKit::WebString>& newly_matching_selectors,
|
| - const WebKit::WebVector<WebKit::WebString>& stopped_matching_selectors);
|
| + blink::WebFrame* frame,
|
| + const blink::WebVector<blink::WebString>& newly_matching_selectors,
|
| + const blink::WebVector<blink::WebString>& stopped_matching_selectors);
|
|
|
| // TODO(mpcomplete): remove. http://crbug.com/100411
|
| bool IsAdblockWithWebRequestInstalled() const {
|
| @@ -248,7 +248,7 @@ class Dispatcher : public content::RenderProcessObserver {
|
| const std::string& extension_id,
|
| int extension_group,
|
| const GURL& url,
|
| - const WebKit::WebSecurityOrigin& origin);
|
| + const blink::WebSecurityOrigin& origin);
|
|
|
| // Gets |field| from |object| or creates it as an empty object if it doesn't
|
| // exist.
|
|
|