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

Unified Diff: ui/views/examples/examples_main.cc

Issue 235043005: x11: Remove X11 message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 8 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
Index: ui/views/examples/examples_main.cc
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 9e028f0443d1d387b76b808ac31fa04f6b9935bc..187e2698ad56cf880e899991e8c2393b9fecccf1 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -2,10 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#if defined(USE_X11)
-#include <X11/Xlib.h>
-#endif
-
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
@@ -27,10 +23,15 @@
#if !defined(OS_CHROMEOS)
#include "ui/views/widget/desktop_aura/desktop_screen.h"
#endif
+
#if defined(OS_WIN)
#include "ui/base/win/scoped_ole_initializer.h"
#endif
+#if defined(USE_X11)
+#include "ui/gfx/x/x11_connection.h"
+#endif
+
int main(int argc, char** argv) {
#if defined(OS_WIN)
ui::ScopedOleInitializer ole_initializer_;
@@ -43,7 +44,7 @@ int main(int argc, char** argv) {
#if defined(USE_X11)
// This demo uses InProcessContextFactory which uses X on a separate Gpu
// thread.
- XInitThreads();
+ gfx::InitializeX11();
#endif
gfx::GLSurface::InitializeOneOff();

Powered by Google App Engine
This is Rietveld 408576698