Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / plugin_process_host.cc

diff --git a/src/content/browser/plugin_process_host.cc b/src/content/browser/plugin_process_host.cc
index 8aa69dd..077f512 100644 (file)
--- a/src/content/browser/plugin_process_host.cc
+++ b/src/content/browser/plugin_process_host.cc
@@ -43,10 +43,6 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gl/gl_switches.h"
 
-#if defined(USE_X11)
-#include "ui/gfx/gtk_native_view_id_manager.h"
-#endif
-
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "content/common/plugin_carbon_interpose_constants_mac.h"
@@ -110,16 +106,6 @@ class PluginSandboxedProcessLauncherDelegate
   DISALLOW_COPY_AND_ASSIGN(PluginSandboxedProcessLauncherDelegate);
 };
 
-#if defined(TOOLKIT_GTK)
-void PluginProcessHost::OnMapNativeViewId(gfx::NativeViewId id,
-                                          gfx::PluginWindowHandle* output) {
-  *output = 0;
-#if !defined(USE_AURA)
-  GtkNativeViewManager::GetInstance()->GetXIDForId(output, id);
-#endif
-}
-#endif  // defined(TOOLKIT_GTK)
-
 PluginProcessHost::PluginProcessHost()
 #if defined(OS_MACOSX)
     : plugin_cursor_visible_(true)
@@ -205,15 +191,9 @@ bool PluginProcessHost::Init(const WebPluginInfo& info) {
   // any associated values) if present in the browser command line
   static const char* const kSwitchNames[] = {
     switches::kDisableBreakpad,
-#if defined(OS_MACOSX)
-    switches::kDisableCoreAnimationPlugins,
-    switches::kEnableSandboxLogging,
-#endif
+    switches::kDisableDirectNPAPIRequests,
     switches::kEnableStatsTable,
     switches::kFullMemoryCrashReport,
-#if defined(OS_WIN)
-    switches::kHighDPISupport,
-#endif
     switches::kLoggingLevel,
     switches::kLogPluginMessages,
     switches::kNoSandbox,
@@ -221,6 +201,13 @@ bool PluginProcessHost::Init(const WebPluginInfo& info) {
     switches::kTestSandbox,
     switches::kTraceStartup,
     switches::kUseGL,
+#if defined(OS_MACOSX)
+    switches::kDisableCoreAnimationPlugins,
+    switches::kEnableSandboxLogging,
+#endif
+#if defined(OS_WIN)
+    switches::kHighDPISupport,
+#endif
   };
 
   cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
@@ -299,10 +286,6 @@ bool PluginProcessHost::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_PluginWindowDestroyed,
                         OnPluginWindowDestroyed)
 #endif
-#if defined(TOOLKIT_GTK)
-    IPC_MESSAGE_HANDLER(PluginProcessHostMsg_MapNativeViewId,
-                        OnMapNativeViewId)
-#endif
 #if defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(PluginProcessHostMsg_PluginSelectWindow,
                         OnPluginSelectWindow)