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

Unified Diff: app/gfx/gl/gl_context_linux.cc

Issue 6257006: Move a bunch of random other files to src/ui/base... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 | « app/gfx/font_util.cc ('k') | app/gtk_integers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/gfx/gl/gl_context_linux.cc
===================================================================
--- app/gfx/gl/gl_context_linux.cc (revision 71854)
+++ app/gfx/gl/gl_context_linux.cc (working copy)
@@ -17,10 +17,10 @@
#include "app/gfx/gl/gl_context_osmesa.h"
#include "app/gfx/gl/gl_context_stub.h"
#include "app/gfx/gl/gl_implementation.h"
-#include "app/x11_util.h"
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
+#include "ui/base/x/x11_util.h"
namespace {
@@ -420,14 +420,14 @@
// Copy the frame into the pixmap.
XWindowAttributes attributes;
XGetWindowAttributes(display, window_, &attributes);
- x11_util::PutARGBImage(display,
- attributes.visual,
- attributes.depth,
- pixmap_,
- pixmap_graphics_context_,
- static_cast<const uint8*>(osmesa_context_.buffer()),
- size.width(),
- size.height());
+ ui::PutARGBImage(display,
+ attributes.visual,
+ attributes.depth,
+ pixmap_,
+ pixmap_graphics_context_,
+ static_cast<const uint8*>(osmesa_context_.buffer()),
+ size.width(),
+ size.height());
// Copy the pixmap to the window.
XCopyArea(display,
« no previous file with comments | « app/gfx/font_util.cc ('k') | app/gtk_integers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698