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

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 23 matching lines @@
 namespace extensions {
 
 using core_api::extension_types::InjectDetails;
 
 ExecuteCodeFunction::ExecuteCodeFunction() {
 }
 
 ExecuteCodeFunction::~ExecuteCodeFunction() {
 }
 
+bool ExecuteCodeFunction::LoadFileForWebUI(
+    const std::string& file_src,
+    const WebUILoadFileCallback& callback) {
+  callback.Run(false, std::string());
+  return false;
+}
+
 void ExecuteCodeFunction::DidLoadFile(bool success, const std::string& data) {
   if (!success || !details_->file) {
     DidLoadAndLocalizeFile(success, data);
     return;
   }
 
   ScriptExecutor::ScriptType script_type =
       ShouldInsertCSS() ? ScriptExecutor::CSS : ScriptExecutor::JAVASCRIPT;
 
   std::string extension_id;
@@ skipping 63 matching lines @@
       SendResponse(false);
   } else {
     // TODO(viettrungluu): bug: there's no particular reason the path should be
     // UTF-8, in which case this may fail.
     error_ = ErrorUtils::FormatErrorMessage(
         kLoadFileError, resource_.relative_path().AsUTF8Unsafe());
     SendResponse(false);
   }
 }
 
+void ExecuteCodeFunction::DidLoadFileForWebUI(bool success,
+                                              const std::string& data) {
+  if (success) {
+    if (!base::IsStringUTF8(data))
+      SendResponse(false);
+    else if (!Execute(data))
+      SendResponse(false);
+  } else {
+    SendResponse(false);
+  }
+}
+
 bool ExecuteCodeFunction::Execute(const std::string& code_string) {
   ScriptExecutor* executor = GetScriptExecutor();
   if (!executor)
     return false;
 
   if (!extension() && !IsWebView())
     return false;
 
   ScriptExecutor::ScriptType script_type = ScriptExecutor::JAVASCRIPT;
   if (ShouldInsertCSS())
@@ skipping 61 matching lines @@
 
   if (!CanExecuteScriptOnPage())
     return false;
 
   if (details_->code.get())
     return Execute(*details_->code);
 
   if (!details_->file.get())
     return false;
 
-  if (!extension())
-    return false;
+  if (!extension()) {

[asargent_no_longer_on_chrome, 2015/03/17 21:41:14]

should this test be "if (IsWebView())" instead of "if (!extension()"?

[Xi Han, 2015/03/17 22:28:21]

This is for webUI, which we have to use different ways to load javascript files.

+    bool is_success = false;
+    is_success = LoadFileForWebUI(
+        *details_->file,
+        base::Bind(&ExecuteCodeFunction::DidLoadFileForWebUI, this));
+    if (!is_success) {
+      SendResponse(false);
+      return false;
+    }
+    // Will finish asynchronously.
+    return true;
+  }

[asargent_no_longer_on_chrome, 2015/03/17 21:41:14]

Also, can you explain why this code is here in this class instead of in
web_view_internal_api.{h,cc}? 

Presumably we don't want to allow this codepath when a non-extension script
context calls chrome.tabs.executeScript, right? (since the implementation of
that lives in ExecuteCodeInTabFunction which is also a subclass of
ExecuteCodeFunction)

[Xi Han, 2015/03/17 22:28:21]

That is fair. Move them back to web_view_internal_api.{h,cc}.

 
   resource_ = extension()->GetResource(*details_->file);
 
   if (resource_.extension_root().empty() || resource_.relative_path().empty()) {
     error_ = kNoCodeOrFileToExecuteError;
     return false;
   }
 
   int resource_id;
   const ComponentExtensionResourceManager*
@@ skipping 21 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_