summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-05 23:33:01 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-05 23:33:01 +0000
commit01083a0d17b0f5a4100fadb2bd5523359d3b938b (patch)
tree4f24ead093a1dcf88099d522d632a58caa23a06f /chrome/app
parent630201eb53202b8b4ae81c4ed8f936be92c135c3 (diff)
downloadchromium_src-01083a0d17b0f5a4100fadb2bd5523359d3b938b.zip
chromium_src-01083a0d17b0f5a4100fadb2bd5523359d3b938b.tar.gz
chromium_src-01083a0d17b0f5a4100fadb2bd5523359d3b938b.tar.bz2
Stub implementation of gtk browser window.
Review URL: http://codereview.chromium.org/21107 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_dll_main.cc12
1 files changed, 12 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 94cedf4..c15f2fc 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -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 @@ int ChromeMain(int argc, const char** argv) {
// 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);