Enable <webview>.executeScript outside of Apps and Extensions [1]

extensions/browser/api/execute_code_function.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
 #define EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_
 
 #include "extensions/browser/api/execute_code_function.h"
 
 #include "extensions/browser/component_extension_resource_manager.h"
@@ skipping 17 matching lines @@
 const char kBadFileEncodingError[] =
     "Could not load file '*' for content script. It isn't UTF-8 encoded.";
 const char kLoadFileError[] = "Failed to load file: \"*\". ";
 
 }
 
 namespace extensions {
 
 using core_api::extension_types::InjectDetails;
 
-ExecuteCodeFunction::ExecuteCodeFunction() {
+ExecuteCodeFunction::ExecuteCodeFunction()
+    : host_id_(new HostID()) {

[Devlin, 2015/02/25 17:22:36]

Why is this is a scoped ptr if it's never null?

[Xi Han, 2015/02/26 15:13:45]

Because we want to set its value in the init() function, while HostID doesn't
provide any setter.

[Devlin, 2015/02/26 17:35:24]

But we can just do host_id_ = HostId(foo, bar), right?

[Xi Han, 2015/02/26 19:58:00]

You are right:) Sorry I was in the old memory that HostID doesn't have the
assignment operator.

 }
 
 ExecuteCodeFunction::~ExecuteCodeFunction() {
 }
 
 void ExecuteCodeFunction::DidLoadFile(bool success, const std::string& data) {
   if (!success || !details_->file) {
     DidLoadAndLocalizeFile(success, data);
     return;
   }
@@ skipping 73 matching lines @@
         kLoadFileError, resource_.relative_path().AsUTF8Unsafe());
     SendResponse(false);
   }
 }
 
 bool ExecuteCodeFunction::Execute(const std::string& code_string) {
   ScriptExecutor* executor = GetScriptExecutor();
   if (!executor)
     return false;
 
-  if (!extension())
+  if (!extension() && !IsWebView())
     return false;
 
   ScriptExecutor::ScriptType script_type = ScriptExecutor::JAVASCRIPT;
   if (ShouldInsertCSS())
     script_type = ScriptExecutor::CSS;
 
   ScriptExecutor::FrameScope frame_scope =
       details_->all_frames.get() && *details_->all_frames
           ? ScriptExecutor::ALL_FRAMES
           : ScriptExecutor::TOP_FRAME;
@@ skipping 12 matching lines @@
     case InjectDetails::RUN_AT_DOCUMENT_START:
       run_at = UserScript::DOCUMENT_START;
       break;
     case InjectDetails::RUN_AT_DOCUMENT_END:
       run_at = UserScript::DOCUMENT_END;
       break;
   }
   CHECK_NE(UserScript::UNDEFINED, run_at);
 
   executor->ExecuteScript(
-      extension()->id(),
+      host_id_->type(),
+      host_id_->id(),
       script_type,
       code_string,
       frame_scope,
       match_about_blank,
       run_at,
       ScriptExecutor::ISOLATED_WORLD,
       IsWebView() ? ScriptExecutor::WEB_VIEW_PROCESS
                   : ScriptExecutor::DEFAULT_PROCESS,
       GetWebViewSrc(),
       file_url_,
@@ skipping 61 matching lines @@
                                                 const base::ListValue& result) {
   if (!error.empty())
     SetError(error);
 
   SendResponse(error.empty());
 }
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_EXECUTE_CODE_FUNCTION_IMPL_H_