diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 21:45:41 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-05 21:45:41 +0000 |
| commit | 116302fcae9274397db086a454d18cbcb354027b (patch) | |
| tree | afdc95d27dc82a6e2d7cd31aa14a9c45bb60843d /ash/wm/image_grid.h | |
| parent | 6d2d55b661b11e038d53c4b9271b67e719a72cc6 (diff) | |
| download | chromium_src-116302fcae9274397db086a454d18cbcb354027b.zip chromium_src-116302fcae9274397db086a454d18cbcb354027b.tar.gz chromium_src-116302fcae9274397db086a454d18cbcb354027b.tar.bz2 | |
ui: Move compositor/ directory out of gfx/, up to ui/.
BUG=104040
R=piman@chromium.org,ben@chromium.org
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10365007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/image_grid.h')
| -rw-r--r-- | ash/wm/image_grid.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/image_grid.h b/ash/wm/image_grid.h index 84119f5..7b53f88 100644 --- a/ash/wm/image_grid.h +++ b/ash/wm/image_grid.h @@ -6,12 +6,12 @@ #define ASH_WM_IMAGE_GRID_H_ #pragma once +#include "ash/ash_export.h" #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "ash/ash_export.h" -#include "ui/gfx/compositor/layer.h" -#include "ui/gfx/compositor/layer_delegate.h" +#include "ui/compositor/layer.h" +#include "ui/compositor/layer_delegate.h" #include "ui/gfx/rect.h" #include "ui/gfx/size.h" @@ -169,7 +169,7 @@ class ASH_EXPORT ImageGrid { // A possibly-arbitrary window that is drawn at the same DPI // (i.e. on the same monitor) as this grid. - // TODO(oshima): move scale factor to gfx/compositor and remove this. + // TODO(oshima): move scale factor to ui/compositor/ and remove this. aura::Window* window_; // Layer that contains all of the image layers. |