inject-js in Window.open options

rogerwang · rogerwang · commit f27c73cb586d · 2014-02-21T13:40:57.000+08:00
diff --git a/src/api/dispatcher_host.cc b/src/api/dispatcher_host.cc
@@ -252,6 +252,12 @@ void DispatcherHost::OnCreateShell(const std::string& url,
   WebContents::CreateParams create_params(browser_context,
                                           new_renderer ? NULL : base_web_contents->GetSiteInstance());
 
+  std::string filename;
+  if (new_manifest->GetString(switches::kmInjectJS, &filename))
+    create_params.nw_inject_js_fn = filename;
+  if (new_manifest->GetString(switches::kmInjectCSS, &filename))
+    create_params.nw_inject_css_fn = filename;
+
   WebContents* web_contents = content::WebContentsImpl::CreateWithOpener(
       create_params,
       static_cast<content::WebContentsImpl*>(base_web_contents));
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -98,6 +98,8 @@ const char kmUserAgent[] = "user-agent";
 const char kmRemotePages[] = "node-remote";
 
 const char kmNewInstance[] = "new-instance";
+const char kmInjectJS[]  = "inject-js";
+const char kmInjectCSS[] = "inject-css";
 
 #if defined(OS_WIN)
 // Enable conversion from vector to raster for any page.
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -56,6 +56,8 @@ extern const char kmPageCache[];
 extern const char kmUserAgent[];
 extern const char kmRemotePages[];
 extern const char kmNewInstance[];
+extern const char kmInjectJS[];
+extern const char kmInjectCSS[];
 
 #if defined(OS_WIN)
 extern const char kPrintRaster[];
diff --git a/src/renderer/nw_render_view_observer.cc b/src/renderer/nw_render_view_observer.cc
@@ -20,17 +20,27 @@
 
 #include "content/nw/src/renderer/nw_render_view_observer.h"
 
+#include <v8.h>
+
+#include "base/file_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "content/nw/src/renderer/common/render_messages.h"
 #include "content/public/renderer/render_view.h"
+#include "content/renderer/render_view_impl.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
+#include "third_party/WebKit/public/web/WebScriptSource.h"
 #include "third_party/WebKit/public/web/WebView.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::RenderView;
+using content::RenderViewImpl;
+
 using WebKit::WebFrame;
 using WebKit::WebRect;
+using WebKit::WebScriptSource;
 using WebKit::WebSize;
 
 namespace nw {
@@ -70,6 +80,25 @@ void NwRenderViewObserver::OnCaptureSnapshot() {
   Send(new NwViewHostMsg_Snapshot(routing_id(), snapshot));
 }
 
+void NwRenderViewObserver::DidFinishDocumentLoad(WebKit::WebFrame* frame) {
+  RenderViewImpl* rv = RenderViewImpl::FromWebView(frame->view());
+  if (!rv)
+    return;
+  std::string js_fn = rv->renderer_preferences_.nw_inject_js_fn;
+  if (js_fn.empty())
+    return;
+  std::string content;
+  base::FilePath path = rv->renderer_preferences_.nw_app_root_path.Append(js_fn);
+  if (!base::ReadFileToString(path, &content)) {
+    LOG(WARNING) << "Failed to load js script file: " << path.value();
+    return;
+  }
+  base::string16 jscript = base::UTF8ToUTF16(content);
+  v8::HandleScope handle_scope(v8::Isolate::GetCurrent());
+  // v8::Handle<v8::Value> result;
+  frame->executeScriptAndReturnValue(WebScriptSource(jscript));
+}
+
 bool NwRenderViewObserver::CaptureSnapshot(WebKit::WebView* view,
                                            SkBitmap* snapshot) {
   view->layout();
diff --git a/src/renderer/nw_render_view_observer.h b/src/renderer/nw_render_view_observer.h
@@ -36,9 +36,11 @@ class NwRenderViewObserver : public content::RenderViewObserver {
   NwRenderViewObserver(content::RenderView* render_view);
   virtual ~NwRenderViewObserver();
 
- private:
   // RenderViewObserver implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void DidFinishDocumentLoad(WebKit::WebFrame* frame) OVERRIDE;
+
+ private:
 
   void OnCaptureSnapshot();
 
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -114,7 +114,8 @@ BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
 
 WebContentsViewPort* ShellContentBrowserClient::OverrideCreateWebContentsView(
       WebContents* web_contents,
-      RenderViewHostDelegateView** render_view_host_delegate_view) {
+      RenderViewHostDelegateView** render_view_host_delegate_view,
+      const WebContents::CreateParams& params) {
   std::string user_agent, rules;
   nw::Package* package = shell_browser_main_parts()->package();
   content::RendererPreferences* prefs = web_contents->GetMutableRendererPrefs();
@@ -133,6 +134,8 @@ WebContentsViewPort* ShellContentBrowserClient::OverrideCreateWebContentsView(
       prefs->nw_remote_page_rules = rules;
 
   prefs->nw_app_root_path = package->path();
+  prefs->nw_inject_css_fn = params.nw_inject_css_fn;
+  prefs->nw_inject_js_fn  = params.nw_inject_js_fn;
   return NULL;
 }
 
diff --git a/src/shell_content_browser_client.h b/src/shell_content_browser_client.h
@@ -34,7 +34,8 @@ class ShellContentBrowserClient : public ContentBrowserClient {
       const MainFunctionParams& parameters) OVERRIDE;
   virtual WebContentsViewPort* OverrideCreateWebContentsView(
       WebContents* web_contents,
-      RenderViewHostDelegateView** render_view_host_delegate_view) OVERRIDE;
+      RenderViewHostDelegateView** render_view_host_delegate_view,
+      const WebContents::CreateParams& params) OVERRIDE;
   virtual std::string GetApplicationLocale() OVERRIDE;
   virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
                                               int child_process_id) OVERRIDE;
