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

extensions/renderer/script_injection_manager.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.
 
 #include "extensions/renderer/script_injection_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/values.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/renderer/extension_helper.h"
 #include "extensions/renderer/extension_injection_host.h"
 #include "extensions/renderer/programmatic_script_injector.h"
 #include "extensions/renderer/script_injection.h"
 #include "extensions/renderer/scripts_run_info.h"
+#include "extensions/renderer/web_ui_injection_host.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
@@ skipping 390 matching lines @@
   if (!main_frame) {
     render_view->Send(
         new ExtensionHostMsg_ExecuteCodeFinished(render_view->GetRoutingID(),
                                                  params.request_id,
                                                  "No main frame",
                                                  GURL(std::string()),
                                                  base::ListValue()));
     return;
   }
 
-  scoped_ptr<const ExtensionInjectionHost> extension_injection_host =
-      ExtensionInjectionHost::Create(params.extension_id, extensions_);
-
-  if (!extension_injection_host.get())
-    return;
+  scoped_ptr<const InjectionHost> injection_host;
+  if (params.host_type == HostID::EXTENSIONS) {
+    injection_host =
+        ExtensionInjectionHost::Create(params.host_id, extensions_).Pass();
+    if (!injection_host.get())
+      return;
+  } else if (params.host_type == HostID::WEBUI) {
+    injection_host = WebUIInjectionHost::Create(
+                         HostID(params.host_type, params.host_id)).Pass();
+  }
 
   scoped_ptr<ScriptInjection> injection(new ScriptInjection(
       scoped_ptr<ScriptInjector>(
           new ProgrammaticScriptInjector(params, main_frame)),
       main_frame,
-      extension_injection_host.Pass(),
+      injection_host.Pass(),
       params.is_web_view ? UserScript::ConsumerInstanceType::WEBVIEW
                          : UserScript::ConsumerInstanceType::TAB,
       static_cast<UserScript::RunLocation>(params.run_at),
       ExtensionHelper::Get(render_view)->tab_id()));
 
   ScriptsRunInfo scripts_run_info;
   FrameStatusMap::const_iterator iter = frame_statuses_.find(main_frame);
 
   if (!injection->TryToInject(
           iter == frame_statuses_.end() ? UserScript::UNDEFINED : iter->second,
@@ skipping 45 matching lines @@
   scoped_ptr<ScriptInjection> injection(*iter);
   pending_injections_.weak_erase(iter);
 
   ScriptsRunInfo scripts_run_info;
   if (injection->OnPermissionGranted(&scripts_run_info)) {
     scripts_run_info.LogRun(injection->web_frame(), UserScript::RUN_DEFERRED);
   }
 }
 
 }  // namespace extensions