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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/gpu/config/gpu_info_collector_x11.cc

Issue 238093002: Revert 263726 "x11: Remove X11 message-pump." (Closed) Base URL: svn://svn.chromium.org/chrome/
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
« no previous file with comments | « trunk/src/content/content_tests.gypi ('k') | trunk/src/ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/gpu/config/gpu_info_collector_x11.cc
===================================================================
--- trunk/src/gpu/config/gpu_info_collector_x11.cc (revision 263732)
+++ trunk/src/gpu/config/gpu_info_collector_x11.cc (working copy)
@@ -20,7 +20,6 @@
#include "library_loaders/libpci.h"
#include "third_party/libXNVCtrl/NVCtrl.h"
#include "third_party/libXNVCtrl/NVCtrlLib.h"
-#include "ui/gfx/x/x11_types.h"
#include "ui/gl/gl_bindings.h"
#include "ui/gl/gl_context.h"
#include "ui/gl/gl_implementation.h"
@@ -71,7 +70,7 @@
// Use NVCtrl extention to query NV driver version.
// Return empty string on failing.
std::string CollectDriverVersionNVidia() {
- Display* display = gfx::GetXDisplay();
+ Display* display = base::MessagePumpForUI::GetDefaultXDisplay();
if (!display) {
LOG(ERROR) << "XOpenDisplay failed.";
return std::string();
« no previous file with comments | « trunk/src/content/content_tests.gypi ('k') | trunk/src/ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698