Index: chrome/gpu/gpu_thread.cc |
diff --git a/chrome/gpu/gpu_thread.cc b/chrome/gpu/gpu_thread.cc |
index 8c1059f54395510f4daa533e18df3878bd3e13b4..85aea62b6d283191eeb486b6ce7045f6c1a4453a 100644 |
--- a/chrome/gpu/gpu_thread.cc |
+++ b/chrome/gpu/gpu_thread.cc |
@@ -15,6 +15,7 @@ |
#include "chrome/common/gpu_info.h" |
#include "chrome/common/gpu_messages.h" |
#include "chrome/gpu/gpu_info_collector.h" |
+#include "gfx/gtk_util.h" |
#include "ipc/ipc_channel_handle.h" |
#if defined(OS_WIN) |
@@ -43,22 +44,7 @@ GpuThread::GpuThread() { |
// rethink whether initializing Gtk is really necessary or whether we |
// should just send the display connection down to the GPUProcessor. |
g_thread_init(NULL); |
- const std::vector<std::string>& args = |
- CommandLine::ForCurrentProcess()->argv(); |
- int argc = args.size(); |
- scoped_array<char *> argv(new char *[argc + 1]); |
- for (size_t i = 0; i < args.size(); ++i) { |
- // TODO(piman@google.com): can gtk_init modify argv? Just being safe |
- // here. |
- argv[i] = strdup(args[i].c_str()); |
- } |
- argv[argc] = NULL; |
- char **argv_pointer = argv.get(); |
- |
- gtk_init(&argc, &argv_pointer); |
- for (size_t i = 0; i < args.size(); ++i) { |
- free(argv[i]); |
- } |
+ gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); |
x11_util::SetDefaultX11ErrorHandlers(); |
} |
#endif |