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 106 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()) {
+    bool is_success = false;
+    is_success = LoadFileForWebUI(

[Devlin, 2015/03/18 16:52:27]

Can we abstract this and the logic to get a file for an extension?  Then, this
would just become something like:
if (!details_->file.get())
  return false;

LoadFile(*details_->file, base::Bind(&ExecuteCodeFunction::OnDidLoadFile,
this));

[Xi Han, 2015/03/18 20:36:26]

It is a good suggestion, but the logic of LoadFile for extensions is too
complected to merge with the one with webUI. So we still keep two different
callback functions here. But what we can do is abstract a LoadFile function
which has the code for extensions in the base class, and move the webUI related
logic to webview's subclass web_view_internal_api.cc{h}.

+        *details_->file,
+        base::Bind(&ExecuteCodeFunction::DidLoadFileForWebUI, this));
+    if (!is_success) {
+      SendResponse(false);
+      return false;
+    }
+    // Will finish asynchronously.
+    return true;
+  }
 
   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_