Upstream version 9.38.204.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / common / xwalk_content_client.cc

diff --git a/src/xwalk/runtime/common/xwalk_content_client.cc b/src/xwalk/runtime/common/xwalk_content_client.cc
index a00de6e..9fe1ee0 100644 (file)
--- a/src/xwalk/runtime/common/xwalk_content_client.cc
+++ b/src/xwalk/runtime/common/xwalk_content_client.cc
@@ -5,28 +5,51 @@
 #include "xwalk/runtime/common/xwalk_content_client.h"
 
 #include "base/command_line.h"
+#include "base/file_util.h"
+#include "base/files/file_path.h"
+#include "base/path_service.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
+#include "components/nacl/common/nacl_process_type.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/user_agent.h"
+#include "content/public/common/pepper_plugin_info.h"
+#if !defined(DISABLE_NACL)
+#include "ppapi/native_client/src/trusted/plugin/ppapi_entrypoints.h"
+#include "ppapi/shared_impl/ppapi_permissions.h"
+#endif
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
-#include "webkit/common/user_agent/user_agent_util.h"
 #include "xwalk/application/common/constants.h"
+#include "xwalk/runtime/common/xwalk_switches.h"
+#include "xwalk/runtime/common/xwalk_paths.h"
 
-namespace xwalk {
+const char* const xwalk::XWalkContentClient::kNaClPluginName = "Native Client";
 
-XWalkContentClient::XWalkContentClient() {
-}
+namespace {
 
-XWalkContentClient::~XWalkContentClient() {
-}
+#if !defined(DISABLE_NACL)
+const char kNaClPluginMimeType[] = "application/x-nacl";
+const char kNaClPluginExtension[] = "";
+const char kNaClPluginDescription[] = "Native Client Executable";
+const uint32 kNaClPluginPermissions = ppapi::PERMISSION_PRIVATE |
+                                      ppapi::PERMISSION_DEV;
 
-std::string XWalkContentClient::GetProduct() const {
-  return std::string("Version/4.0");
+const char kPnaclPluginMimeType[] = "application/x-pnacl";
+const char kPnaclPluginExtension[] = "";
+const char kPnaclPluginDescription[] = "Portable Native Client Executable";
+#endif
+
+}  // namespace
+
+namespace xwalk {
+
+std::string GetProduct() {
+  return "Chrome/" CHROME_VERSION;
 }
 
-std::string XWalkContentClient::GetUserAgent() const {
-  std::string product = "Chrome/" CHROME_VERSION;
+std::string GetUserAgent() {
+  std::string product = GetProduct();
 #if (defined(OS_TIZEN_MOBILE) || defined(OS_ANDROID))
   product += " Mobile Crosswalk/" XWALK_VERSION;
 #else
@@ -35,10 +58,63 @@ std::string XWalkContentClient::GetUserAgent() const {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kUseMobileUserAgent))
     product += " Mobile";
-  return webkit_glue::BuildUserAgentFromProduct(product);
+  return content::BuildUserAgentFromProduct(product);
+}
+
+XWalkContentClient::XWalkContentClient() {
 }
 
-string16 XWalkContentClient::GetLocalizedString(int message_id) const {
+XWalkContentClient::~XWalkContentClient() {
+  xwalk::GetUserAgent();
+}
+
+void XWalkContentClient::AddPepperPlugins(
+    std::vector<content::PepperPluginInfo>* plugins) {
+#if !defined(DISABLE_NACL)
+  // Handle Native Client just like the PDF plugin. This means that it is
+  // enabled by default for the non-portable case.  This allows apps installed
+  // from the Chrome Web Store to use NaCl even if the command line switch
+  // isn't set.  For other uses of NaCl we check for the command line switch.
+  // Specifically, Portable Native Client is only enabled by the command line
+  // switch.
+  base::FilePath path;
+  if (PathService::Get(xwalk::FILE_NACL_PLUGIN, &path)) {
+    content::PepperPluginInfo nacl;
+    // The nacl plugin is now built into the Chromium binary.
+    nacl.is_internal = true;
+    nacl.path = path;
+    nacl.name = XWalkContentClient::kNaClPluginName;
+    content::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType,
+                                              kNaClPluginExtension,
+                                              kNaClPluginDescription);
+    nacl.mime_types.push_back(nacl_mime_type);
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kDisablePnacl)) {
+      content::WebPluginMimeType pnacl_mime_type(kPnaclPluginMimeType,
+                                                 kPnaclPluginExtension,
+                                                 kPnaclPluginDescription);
+      nacl.mime_types.push_back(pnacl_mime_type);
+    }
+    nacl.internal_entry_points.get_interface = nacl_plugin::PPP_GetInterface;
+    nacl.internal_entry_points.initialize_module =
+        nacl_plugin::PPP_InitializeModule;
+    nacl.internal_entry_points.shutdown_module =
+        nacl_plugin::PPP_ShutdownModule;
+    nacl.permissions = kNaClPluginPermissions;
+    plugins->push_back(nacl);
+  }
+#endif
+}
+
+std::string XWalkContentClient::GetProduct() const {
+  return xwalk::GetProduct();
+}
+
+std::string XWalkContentClient::GetUserAgent() const {
+  return xwalk::GetUserAgent();
+}
+
+base::string16 XWalkContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
@@ -65,4 +141,16 @@ void XWalkContentClient::AddAdditionalSchemes(
   savable_schemes->push_back(application::kApplicationScheme);
 }
 
+std::string XWalkContentClient::GetProcessTypeNameInEnglish(int type) {
+  switch (type) {
+    case PROCESS_TYPE_NACL_LOADER:
+      return "Native Client module";
+    case PROCESS_TYPE_NACL_BROKER:
+      return "Native Client broker";
+  }
+
+  DCHECK(false) << "Unknown child process type!";
+  return "Unknown";
+}
+
 }  // namespace xwalk