Chromium Code Reviews| Index: chrome/browser/extensions/api/tabs/tabs_api.cc |
| diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc |
| index 39607d2b0f7f2532c3d2d37871f069edea697e07..2df74ed0b9f3537ea46f99d0a7a31b9f173da99d 100644 |
| --- a/chrome/browser/extensions/api/tabs/tabs_api.cc |
| +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc |
| @@ -1366,19 +1366,19 @@ bool TabsUpdateFunction::UpdateURL(const std::string &url_string, |
| return false; |
| } |
| - TabHelper::FromWebContents(web_contents_)-> |
| - script_executor()->ExecuteScript( |
| - extension_id(), |
| - ScriptExecutor::JAVASCRIPT, |
| - url.GetContent(), |
| - ScriptExecutor::TOP_FRAME, |
| - UserScript::DOCUMENT_IDLE, |
| - ScriptExecutor::MAIN_WORLD, |
| - ScriptExecutor::DEFAULT_PROCESS, |
| - GURL(), |
| - user_gesture_, |
| - ScriptExecutor::NO_RESULT, |
| - base::Bind(&TabsUpdateFunction::OnExecuteCodeFinished, this)); |
| + TabHelper::FromWebContents(web_contents_)->script_executor()->ExecuteScript( |
| + extension_id(), |
| + ScriptExecutor::JAVASCRIPT, |
| + url.GetContent(), |
| + ScriptExecutor::TOP_FRAME, |
| + UserScript::DOCUMENT_IDLE, |
| + ScriptExecutor::MAIN_WORLD, |
| + ScriptExecutor::DEFAULT_PROCESS, |
| + "", |
|
Fady Samuel
2014/04/07 14:03:10
std::string(),
Xi Han
2014/04/07 14:58:09
Done.
Xi Han
2014/04/07 21:09:43
Done.
Xi Han
2014/04/07 21:09:43
Done.
|
| + GURL(), |
| + user_gesture_, |
| + ScriptExecutor::NO_RESULT, |
| + base::Bind(&TabsUpdateFunction::OnExecuteCodeFinished, this)); |
| *is_async = true; |
| return true; |
| @@ -1865,6 +1865,10 @@ bool ExecuteCodeInTabFunction::IsWebView() const { |
| return false; |
| } |
| +std::string ExecuteCodeInTabFunction::GetWebViewSrc() const { |
| + return std::string(); |
| +} |
| + |
| bool TabsExecuteScriptFunction::ShouldInsertCSS() const { |
| return false; |
| } |