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

extensions/browser/api/execute_code_function.h

Index: extensions/browser/api/execute_code_function.h
diff --git a/extensions/browser/api/execute_code_function.h b/extensions/browser/api/execute_code_function.h
index db0f441c8149baa5391e216057478f1b77181a7b..e0a871ec80612bee20751a14161e9a5231fba824 100644
--- a/extensions/browser/api/execute_code_function.h
+++ b/extensions/browser/api/execute_code_function.h
@@ -19,6 +19,11 @@ class ExecuteCodeFunction : public AsyncExtensionFunction {
  public:
   ExecuteCodeFunction();
 
+  // Called when contents from the loaded file have been localized.
+  void DidLoadAndLocalizeFile(const std::string& file,

[Devlin, 2015/03/25 22:12:20]

Why is this public now?

[Xi Han, 2015/03/26 14:00:20]

Oops, I bound &ExecuteCodeFunction::DidLoadAndLocalizeFile in
web_view_internal_api.cc, but should bind
&WebViewInternalExecuteCodeFunction::DidLoadAndLocalizeFile. Move to protected.

+                              bool success,
+                              const std::string& data);
+
  protected:

[Devlin, 2015/03/25 22:12:20]

I don't know why I didn't notice this before, but why do we have two 'protected'
sections?  The one on line 53 should be deleted. :)

[Xi Han, 2015/03/26 14:00:20]

I didn't notice that either, removed.

   ~ExecuteCodeFunction() override;
 
@@ -37,14 +42,17 @@ class ExecuteCodeFunction : public AsyncExtensionFunction {
                                      const GURL& on_url,
                                      const base::ListValue& result);
 
-  // The injection details.
-  scoped_ptr<core_api::extension_types::InjectDetails> details_;
-
   const HostID& host_id() const { return host_id_; }
   void set_host_id(HostID host_id) {
     host_id_ = host_id;
   }
 
+  // The injection details.
+  scoped_ptr<core_api::extension_types::InjectDetails> details_;
+
+ protected:
+  virtual bool LoadFile(const std::string& file);
+
  private:
   // Called when contents from the file whose path is specified in JSON
   // arguments has been loaded.
@@ -58,9 +66,6 @@ class ExecuteCodeFunction : public AsyncExtensionFunction {
                                 const base::FilePath& extension_path,
                                 const std::string& extension_default_locale);
 
-  // Called when contents from the loaded file have been localized.
-  void DidLoadAndLocalizeFile(bool success, const std::string& data);
-
   // Run in UI thread.  Code string contains the code to be executed. Returns
   // true on success. If true is returned, this does an AddRef.
   bool Execute(const std::string& code_string);