Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / common / chrome_content_client.cc

diff --git a/src/chrome/common/chrome_content_client.cc b/src/chrome/common/chrome_content_client.cc
index 9e46c3a..9540a4b 100644 (file)
--- a/src/chrome/common/chrome_content_client.cc
+++ b/src/chrome/common/chrome_content_client.cc
@@ -29,6 +29,7 @@
 #include "content/public/common/url_constants.h"
 #include "content/public/common/user_agent.h"
 #include "extensions/common/constants.h"
+#include "extensions/common/feature_switch.h"
 #include "gpu/config/gpu_info.h"
 #include "net/http/http_util.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -141,6 +142,9 @@ void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
       pdf.name = ChromeContentClient::kPDFPluginName;
       if (CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kOutOfProcessPdf)) {
+        // Always enable the MIME handler view flag for OOP PDF.
+        extensions::FeatureSwitch::mime_handler_view()->SetOverrideValue(
+            extensions::FeatureSwitch::OVERRIDE_ENABLED);
         pdf.is_out_of_process = true;
         content::WebPluginMimeType pdf_mime_type(kPDFPluginOutOfProcessMimeType,
                                                  kPDFPluginExtension,
@@ -411,8 +415,7 @@ bool GetBundledPepperFlash(content::PepperPluginInfo* plugin) {
 
 std::string GetProduct() {
   chrome::VersionInfo version_info;
-  return version_info.is_valid() ?
-      version_info.ProductNameAndVersionForUserAgent() : std::string();
+  return version_info.ProductNameAndVersionForUserAgent();
 }
 
 }  // namespace