summaryrefslogtreecommitdiffstats
path: root/chrome/plugin/plugin_main.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-06 21:06:39 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-06 21:06:39 +0000
commitda373225b0783166bca66c3534f7bde71eae0c51 (patch)
treebd744dbfae4f427cf4d9a42996e4ef07ea1da9c1 /chrome/plugin/plugin_main.cc
parentf98c1541c7c5671ed1de13ffc802d7e0bba276e9 (diff)
downloadchromium_src-da373225b0783166bca66c3534f7bde71eae0c51.zip
chromium_src-da373225b0783166bca66c3534f7bde71eae0c51.tar.gz
chromium_src-da373225b0783166bca66c3534f7bde71eae0c51.tar.bz2
Revert "linux: OOP windowed plugins"
This reverts r19983. Test failures on Mac and Windows. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/plugin_main.cc')
-rw-r--r--chrome/plugin/plugin_main.cc16
1 files changed, 0 insertions, 16 deletions
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index a710b70..fb8880f 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -67,22 +67,6 @@ int PluginMain(const MainFunctionParams& parameters) {
MB_OK | MB_SETFOREGROUND);
}
#else
-#if defined(OS_LINUX)
- {
- // XEmbed plugins assume they are hosted in a Gtk application, so we need
- // to initialize Gtk in the plugin process.
- // TODO(evanm): hoist this up nearer to where we have argc/argv.
- const std::vector<std::string>& args = parameters.command_line_.argv();
- int argc = args.size();
- scoped_array<const char *> argv(new const char *[argc + 1]);
- for (int i = 0; i < argc; ++i) {
- argv[i] = args[i].c_str();
- }
- argv[argc] = NULL;
- const char **argv_pointer = argv.get();
- gtk_init(&argc, const_cast<char***>(&argv_pointer));
- }
-#endif
NOTIMPLEMENTED() << " non-windows startup, plugin startup dialog etc.";
#endif