| Index: chrome/browser/extensions/api/webview/webview_api.cc
|
| diff --git a/chrome/browser/extensions/api/webview/webview_api.cc b/chrome/browser/extensions/api/webview/webview_api.cc
|
| index 54578912f00d6c0b4861048b7c4c63e9fb0b4c76..49bfa51b811fc8794dbf7d5f21fb8ccc76ef06af 100644
|
| --- a/chrome/browser/extensions/api/webview/webview_api.cc
|
| +++ b/chrome/browser/extensions/api/webview/webview_api.cc
|
| @@ -4,10 +4,11 @@
|
|
|
| #include "chrome/browser/extensions/api/webview/webview_api.h"
|
|
|
| +#include "chrome/common/extensions/api/tabs.h"
|
| #include "chrome/common/extensions/api/webview.h"
|
| #include "content/public/browser/render_view_host.h"
|
|
|
| -using namespace extensions::api::webview;
|
| +using namespace extensions::api;
|
|
|
| WebviewExecuteScriptFunction::WebviewExecuteScriptFunction() {
|
| }
|
| @@ -16,8 +17,8 @@ WebviewExecuteScriptFunction::~WebviewExecuteScriptFunction() {
|
| }
|
|
|
| bool WebviewExecuteScriptFunction::RunImpl() {
|
| - scoped_ptr<ExecuteScript::Params> params(
|
| - extensions::api::webview::ExecuteScript::Params::Create(*args_));
|
| + scoped_ptr<webview::ExecuteScript::Params> params(
|
| + webview::ExecuteScript::Params::Create(*args_));
|
| EXTENSION_FUNCTION_VALIDATE(params.get());
|
|
|
| content::RenderViewHost* guest_rvh =
|
| @@ -42,14 +43,14 @@ bool WebviewExecuteScriptFunction::RunImpl() {
|
| extensions::UserScript::RunLocation run_at =
|
| extensions::UserScript::UNDEFINED;
|
| switch (params->details.run_at) {
|
| - case InjectDetails::RUN_AT_NONE:
|
| - case InjectDetails::RUN_AT_DOCUMENT_IDLE:
|
| + case tabs::InjectDetails::RUN_AT_NONE:
|
| + case tabs::InjectDetails::RUN_AT_DOCUMENT_IDLE:
|
| run_at = extensions::UserScript::DOCUMENT_IDLE;
|
| break;
|
| - case InjectDetails::RUN_AT_DOCUMENT_START:
|
| + case tabs::InjectDetails::RUN_AT_DOCUMENT_START:
|
| run_at = extensions::UserScript::DOCUMENT_START;
|
| break;
|
| - case InjectDetails::RUN_AT_DOCUMENT_END:
|
| + case tabs::InjectDetails::RUN_AT_DOCUMENT_END:
|
| run_at = extensions::UserScript::DOCUMENT_END;
|
| break;
|
| }
|
|
|