diff options
| author | xyzzyz <xyzzyz@chromium.org> | 2016-03-23 17:32:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-24 00:38:42 +0000 |
| commit | f4a91b9728184d060805126d604cb7c8733624ee (patch) | |
| tree | 229288923cc212f764dd12d1c2d7f3d39fea7092 /blimp | |
| parent | 1a34fd0293910fcb86f7c4366b8bbb6a2e3e9b6d (diff) | |
| download | chromium_src-f4a91b9728184d060805126d604cb7c8733624ee.zip chromium_src-f4a91b9728184d060805126d604cb7c8733624ee.tar.gz chromium_src-f4a91b9728184d060805126d604cb7c8733624ee.tar.bz2 | |
Remove dependency of Blimp on X11/Xlib.h header to avoid namespace polution
by #define-s
Xlib.h has #define Status int which conflicts with Status class in protobuf
BUG=597321
Review URL: https://codereview.chromium.org/1826073002
Cr-Commit-Position: refs/heads/master@{#382989}
Diffstat (limited to 'blimp')
| -rw-r--r-- | blimp/client/app/linux/blimp_main.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/blimp/client/app/linux/blimp_main.cc b/blimp/client/app/linux/blimp_main.cc index 3eedffe..b11ba48 100644 --- a/blimp/client/app/linux/blimp_main.cc +++ b/blimp/client/app/linux/blimp_main.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <X11/Xlib.h> - #include <string> #include "base/at_exit.h" @@ -16,6 +14,7 @@ #include "blimp/client/feature/navigation_feature.h" #include "blimp/client/feature/tab_control_feature.h" #include "blimp/client/session/assignment_source.h" +#include "ui/gfx/x/x11_connection.h" namespace { const char kDummyLoginToken[] = ""; @@ -27,7 +26,7 @@ int main(int argc, const char**argv) { base::AtExitManager at_exit; base::CommandLine::Init(argc, argv); - XInitThreads(); + CHECK(gfx::InitializeThreadedX11()); blimp::client::InitializeLogging(); blimp::client::InitializeMainMessageLoop(); |