Override User-Agent from package.json

rogerwang · rogerwang · commit 9094f2dca771 · 2012-12-17T14:41:01.000+08:00
Fix nwjs#263
diff --git a/src/common/shell_switches.cc b/src/common/shell_switches.cc
@@ -86,4 +86,5 @@ const char kmPlugin[] = "plugin";
 // Whether to enable page caches.
 const char kmPageCache[] = "page-cache";
 
+const char kmUserAgent[] = "user-agent";
 }  // namespace switches
diff --git a/src/common/shell_switches.h b/src/common/shell_switches.h
@@ -49,6 +49,7 @@ extern const char kmWebgl[];
 extern const char kmJava[];
 extern const char kmPlugin[];
 extern const char kmPageCache[];
+extern const char kmUserAgent[];
 
 }  // namespace switches
 
diff --git a/src/nw_shell.cc b/src/nw_shell.cc
@@ -71,8 +71,12 @@ Shell* Shell::Create(BrowserContext* browser_context,
       base_web_contents);
 
   Shell* shell = new Shell(web_contents, GetPackage()->window());
-  web_contents->GetController().LoadURL(
-      url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
+  NavigationController::LoadURLParams params(url);
+  params.transition_type = PAGE_TRANSITION_TYPED;
+  params.override_user_agent = NavigationController::UA_OVERRIDE_TRUE;
+
+  web_contents->GetController().LoadURLWithParams(params);
+
   return shell;
 }
 
diff --git a/src/shell_content_browser_client.cc b/src/shell_content_browser_client.cc
@@ -23,17 +23,21 @@
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/values.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/resource_dispatcher_host.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/common/renderer_preferences.h"
 #include "content/nw/src/api/dispatcher_host.h"
 #include "content/nw/src/common/shell_switches.h"
 #include "content/nw/src/browser/shell_devtools_delegate.h"
 #include "content/nw/src/browser/shell_resource_dispatcher_host_delegate.h"
 #include "content/nw/src/media/media_internals.h"
 #include "content/nw/src/nw_package.h"
 #include "content/nw/src/nw_shell.h"
+#include "content/nw/src/nw_version.h"
 #include "content/nw/src/shell_browser_context.h"
 #include "content/nw/src/shell_browser_main_parts.h"
 #include "geolocation/shell_access_token_store.h"
@@ -57,6 +61,25 @@ BrowserMainParts* ShellContentBrowserClient::CreateBrowserMainParts(
   return shell_browser_main_parts_;
 }
 
+WebContentsView* ShellContentBrowserClient::OverrideCreateWebContentsView(
+      WebContents* web_contents,
+      RenderViewHostDelegateView** render_view_host_delegate_view) {
+  std::string user_agent;
+  nw::Package* package = shell_browser_main_parts()->package();
+  if (package->root()->GetString(switches::kmUserAgent, &user_agent)) {
+    std::string name, version;
+    package->root()->GetString(switches::kmName, &name);
+    package->root()->GetString("version", &version);
+    ReplaceSubstringsAfterOffset(&user_agent, 0, "%name", name);
+    ReplaceSubstringsAfterOffset(&user_agent, 0, "%ver", version);
+    ReplaceSubstringsAfterOffset(&user_agent, 0, "%nwver", NW_VERSION_STRING);
+    content::RendererPreferences* prefs =
+      web_contents->GetMutableRendererPrefs();
+    prefs->user_agent_override = user_agent;
+  }
+  return NULL;
+}
+
 void ShellContentBrowserClient::RenderViewHostCreated(
     RenderViewHost* render_view_host) {
   new api::DispatcherHost(render_view_host);
diff --git a/src/shell_content_browser_client.h b/src/shell_content_browser_client.h
@@ -28,6 +28,9 @@ class ShellContentBrowserClient : public ContentBrowserClient {
       const MainFunctionParams& parameters) OVERRIDE;
   virtual void RenderViewHostCreated(
       RenderViewHost* render_view_host) OVERRIDE;
+  virtual WebContentsView* OverrideCreateWebContentsView(
+      WebContents* web_contents,
+      RenderViewHostDelegateView** render_view_host_delegate_view) OVERRIDE;
   virtual std::string GetApplicationLocale() OVERRIDE;
   virtual void AppendExtraCommandLineSwitches(CommandLine* command_line,
                                               int child_process_id) OVERRIDE;
