summaryrefslogtreecommitdiffstats
path: root/views/desktop/desktop_main.cc
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 16:23:58 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 16:23:58 +0000
commita841cdeb52517f44ed2ffe565ecbf7d32e0dc8c8 (patch)
treedc1c7a5609e655e97345dbe709ca45c5be1df39a /views/desktop/desktop_main.cc
parent699c26c98e5397d59db332c794915b87089eaceb (diff)
downloadchromium_src-a841cdeb52517f44ed2ffe565ecbf7d32e0dc8c8.zip
chromium_src-a841cdeb52517f44ed2ffe565ecbf7d32e0dc8c8.tar.gz
chromium_src-a841cdeb52517f44ed2ffe565ecbf7d32e0dc8c8.tar.bz2
views: Run desktop on linux.
BUG=none TEST=none Review URL: http://codereview.chromium.org/7076017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/desktop/desktop_main.cc')
-rw-r--r--views/desktop/desktop_main.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/views/desktop/desktop_main.cc b/views/desktop/desktop_main.cc
index 96bdefd..e37e954 100644
--- a/views/desktop/desktop_main.cc
+++ b/views/desktop/desktop_main.cc
@@ -21,6 +21,11 @@
int main(int argc, char** argv) {
#if defined(OS_WIN)
OleInitialize(NULL);
+#elif defined(OS_LINUX)
+ // Initializes gtk stuff.
+ g_thread_init(NULL);
+ g_type_init();
+ gtk_init(&argc, &argv);
#endif
CommandLine::Init(argc, argv);