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

Unified Diff: ui/compositor/test/test_compositor_host_linux.cc

Issue 11138008: compositor: Reuse GetXDisplay() function from x11_util.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 2 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
« no previous file with comments | « ui/compositor/test/test_compositor_host.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/test_compositor_host_linux.cc
diff --git a/ui/compositor/test/test_compositor_host_linux.cc b/ui/compositor/test/test_compositor_host_linux.cc
index b6c64a46b875ab149147eb0ea8b27691008fedcf..b370ad7290b18561962c103b2d68394afbd60a26 100644
--- a/ui/compositor/test/test_compositor_host_linux.cc
+++ b/ui/compositor/test/test_compositor_host_linux.cc
@@ -4,18 +4,19 @@
#include "ui/compositor/test/test_compositor_host.h"
+#include <X11/Xlib.h>
+
#include "base/basictypes.h"
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
+#include "base/message_loop.h"
#include "ui/base/x/x11_util.h"
#include "ui/compositor/compositor.h"
#include "ui/gfx/rect.h"
-#include <X11/Xlib.h>
-
namespace ui {
class TestCompositorHostLinux : public TestCompositorHost,
@@ -54,7 +55,7 @@ TestCompositorHostLinux::~TestCompositorHostLinux() {
}
void TestCompositorHostLinux::Show() {
- Display* display = base::MessagePumpForUI::GetDefaultXDisplay();
+ Display* display = GetXDisplay();
XSetWindowAttributes swa;
swa.event_mask = StructureNotifyMask | ExposureMask;
swa.override_redirect = True;
« no previous file with comments | « ui/compositor/test/test_compositor_host.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698