Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5257)

Unified Diff: chrome/plugin/plugin_main.cc

Issue 146078: linux: OOP windowed plugins (Closed)
Patch Set: new version Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/plugin/webplugin_delegate_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/plugin/plugin_main.cc
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index fb8880f0dc56c62edcc28df39213274d48794540..7a3295a4257b2309dc00056ac66c14d8d12f9548 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -67,6 +67,21 @@ 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.
+ 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
« no previous file with comments | « chrome/common/render_messages_internal.h ('k') | chrome/plugin/webplugin_delegate_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698