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

extensions/browser/api/execute_code_function.cc

Index: extensions/browser/api/execute_code_function.cc
diff --git a/extensions/browser/api/execute_code_function.cc b/extensions/browser/api/execute_code_function.cc
index aebf61f46b4dd9dcec948e8cfa5326fea796cef3..ce4b29cfc2c9f68c070d35c3754cd639de4c2230 100644
--- a/extensions/browser/api/execute_code_function.cc
+++ b/extensions/browser/api/execute_code_function.cc
@@ -124,6 +124,18 @@ void ExecuteCodeFunction::DidLoadAndLocalizeFile(bool success,
   }
 }
 
+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)
@@ -205,8 +217,18 @@ bool ExecuteCodeFunction::RunAsync() {
   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);