| Index: chrome/renderer/extensions/user_script_slave.cc
|
| diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc
|
| index a54438a934c998a2a36129cbc5f4ecf08e6719a3..526a5109ae2884da8a77c60d8d4d3bf472231f8a 100644
|
| --- a/chrome/renderer/extensions/user_script_slave.cc
|
| +++ b/chrome/renderer/extensions/user_script_slave.cc
|
| @@ -37,12 +37,12 @@
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "url/gurl.h"
|
|
|
| -using WebKit::WebFrame;
|
| -using WebKit::WebSecurityOrigin;
|
| -using WebKit::WebSecurityPolicy;
|
| -using WebKit::WebString;
|
| -using WebKit::WebVector;
|
| -using WebKit::WebView;
|
| +using blink::WebFrame;
|
| +using blink::WebSecurityOrigin;
|
| +using blink::WebSecurityPolicy;
|
| +using blink::WebString;
|
| +using blink::WebVector;
|
| +using blink::WebView;
|
| using content::RenderThread;
|
|
|
| namespace extensions {
|
| @@ -248,7 +248,7 @@ GURL UserScriptSlave::GetDataSourceURLForFrame(const WebFrame* frame) {
|
| // changes to match the parent document after Gmail document.writes into
|
| // it to create the editor.
|
| // http://code.google.com/p/chromium/issues/detail?id=86742
|
| - WebKit::WebDataSource* data_source = frame->provisionalDataSource() ?
|
| + blink::WebDataSource* data_source = frame->provisionalDataSource() ?
|
| frame->provisionalDataSource() : frame->dataSource();
|
| CHECK(data_source);
|
| return GURL(data_source->request().url());
|
| @@ -349,7 +349,7 @@ void UserScriptSlave::InjectScripts(WebFrame* frame,
|
|
|
| // Notify the browser if any extensions are now executing scripts.
|
| if (!extensions_executing_scripts.empty()) {
|
| - WebKit::WebFrame* top_frame = frame->top();
|
| + blink::WebFrame* top_frame = frame->top();
|
| content::RenderView* render_view =
|
| content::RenderView::FromWebView(top_frame->view());
|
| render_view->Send(new ExtensionHostMsg_ContentScriptsExecuting(
|
|
|