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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 21107: Stub implementation of gtk browser window. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 10 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 | « no previous file | chrome/browser/browser.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/chrome_dll_main.cc
===================================================================
--- chrome/app/chrome_dll_main.cc (revision 9259)
+++ chrome/app/chrome_dll_main.cc (working copy)
@@ -16,6 +16,10 @@
#include <new.h>
#endif
+#if defined(OS_LINUX)
+#include <gtk/gtk.h>
+#endif
+
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/icu_util.h"
@@ -203,6 +207,14 @@
// before we invoke the main UI loop near the bottom of this function.
base::ScopedNSAutoreleasePool autorelease_pool;
+#if defined(OS_LINUX)
+ // gtk_init() can change |argc| and |argv| and thus must be called before
+ // CommandLine::Init().
+ // TODO(estade): we should make a copy of |argv| instead of const_casting
+ // it.
+ gtk_init(&argc, const_cast<char***>(&argv));
+#endif
+
// Initialize the command line.
#if defined(OS_WIN)
CommandLine::Init(0, NULL);
« no previous file with comments | « no previous file | chrome/browser/browser.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698