diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-05 01:53:38 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-05 01:53:38 +0000 |
| commit | 08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8 (patch) | |
| tree | f961683ebee575109805b3d465032057f4b01fe5 /app | |
| parent | b87b12e002f8c21806b4848be90c5e563bf5337d (diff) | |
| download | chromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.zip chromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.tar.gz chromium_src-08397d5343ddaba1a32a5ac7e0bf3bc03bd3bdf8.tar.bz2 | |
Change includes of gfx/* to ui/gfx/*
BUG=71063
TEST=compiled
Review URL: http://codereview.chromium.org/6312156
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/gfx/gl/gl_context.h | 4 | ||||
| -rw-r--r-- | app/gfx/gl/gl_context_egl.h | 2 | ||||
| -rw-r--r-- | app/gfx/gl/gl_context_osmesa.h | 2 | ||||
| -rw-r--r-- | app/surface/accelerated_surface_mac.cc | 2 | ||||
| -rw-r--r-- | app/surface/accelerated_surface_mac.h | 4 | ||||
| -rw-r--r-- | app/surface/transport_dib_linux.cc | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/app/gfx/gl/gl_context.h b/app/gfx/gl/gl_context.h index f028704..08653f3 100644 --- a/app/gfx/gl/gl_context.h +++ b/app/gfx/gl/gl_context.h @@ -9,8 +9,8 @@ #include <string> #include "build/build_config.h" -#include "gfx/native_widget_types.h" -#include "gfx/size.h" +#include "ui/gfx/native_widget_types.h" +#include "ui/gfx/size.h" namespace gfx { diff --git a/app/gfx/gl/gl_context_egl.h b/app/gfx/gl/gl_context_egl.h index fbbdabb..cfe0d89 100644 --- a/app/gfx/gl/gl_context_egl.h +++ b/app/gfx/gl/gl_context_egl.h @@ -8,7 +8,7 @@ #include "app/gfx/gl/gl_context.h" #include "base/ref_counted.h" -#include "gfx/size.h" +#include "ui/gfx/size.h" typedef void* EGLDisplay; typedef void* EGLContext; diff --git a/app/gfx/gl/gl_context_osmesa.h b/app/gfx/gl/gl_context_osmesa.h index 649b8c2..50ab354 100644 --- a/app/gfx/gl/gl_context_osmesa.h +++ b/app/gfx/gl/gl_context_osmesa.h @@ -7,8 +7,8 @@ #pragma once #include "base/scoped_ptr.h" -#include "gfx/size.h" #include "app/gfx/gl/gl_context.h" +#include "ui/gfx/size.h" typedef struct osmesa_context *OSMesaContext; diff --git a/app/surface/accelerated_surface_mac.cc b/app/surface/accelerated_surface_mac.cc index 0919e35..0060fda 100644 --- a/app/surface/accelerated_surface_mac.cc +++ b/app/surface/accelerated_surface_mac.cc @@ -9,7 +9,7 @@ #include "app/surface/io_surface_support_mac.h" #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" -#include "gfx/rect.h" +#include "ui/gfx/rect.h" AcceleratedSurface::AcceleratedSurface() : io_surface_id_(0), diff --git a/app/surface/accelerated_surface_mac.h b/app/surface/accelerated_surface_mac.h index a43effa..60f9a46 100644 --- a/app/surface/accelerated_surface_mac.h +++ b/app/surface/accelerated_surface_mac.h @@ -13,8 +13,8 @@ #include "base/callback.h" #include "base/mac/scoped_cftyperef.h" #include "base/scoped_ptr.h" -#include "gfx/rect.h" -#include "gfx/size.h" +#include "ui/gfx/rect.h" +#include "ui/gfx/size.h" // Should not include GL headers in a header file. Forward declare these types // instead. diff --git a/app/surface/transport_dib_linux.cc b/app/surface/transport_dib_linux.cc index 549ee52..69fabff 100644 --- a/app/surface/transport_dib_linux.cc +++ b/app/surface/transport_dib_linux.cc @@ -10,9 +10,9 @@ #include "app/surface/transport_dib.h" #include "base/logging.h" #include "base/scoped_ptr.h" -#include "gfx/size.h" #include "skia/ext/platform_canvas.h" #include "ui/base/x/x11_util.h" +#include "ui/gfx/size.h" // The shmat system call uses this as it's invalid return address static void *const kInvalidAddress = (void*) -1; |