diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 16:23:58 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-26 16:23:58 +0000 |
| commit | a841cdeb52517f44ed2ffe565ecbf7d32e0dc8c8 (patch) | |
| tree | dc1c7a5609e655e97345dbe709ca45c5be1df39a /views | |
| parent | 699c26c98e5397d59db332c794915b87089eaceb (diff) | |
| download | chromium_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')
| -rw-r--r-- | views/desktop/desktop_main.cc | 5 | ||||
| -rw-r--r-- | views/desktop/desktop_window.cc | 2 |
2 files changed, 6 insertions, 1 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); diff --git a/views/desktop/desktop_window.cc b/views/desktop/desktop_window.cc index a8f9dd8..e6c073b 100644 --- a/views/desktop/desktop_window.cc +++ b/views/desktop/desktop_window.cc @@ -42,8 +42,8 @@ class TestWindowContentView : public View, return this; } - SkColor color_; std::wstring title_; + SkColor color_; DISALLOW_COPY_AND_ASSIGN(TestWindowContentView); }; |