diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 15:49:10 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-23 15:49:10 +0000 |
| commit | 7c06093ae495073e7b5f00424ac967b6c27917a9 (patch) | |
| tree | 8eba81df2b7b02a49d798240816bb8c702391b8d /views | |
| parent | 09ab891aeda99c16dac070242ef172c43299afc4 (diff) | |
| download | chromium_src-7c06093ae495073e7b5f00424ac967b6c27917a9.zip chromium_src-7c06093ae495073e7b5f00424ac967b6c27917a9.tar.gz chromium_src-7c06093ae495073e7b5f00424ac967b6c27917a9.tar.bz2 | |
Refactor: Move gfx/compositor* to gfx/compositor/
compositor_gl.cc (in gfx) depends on app_base (for gl_bindings), but app_base depends on gfx. This gets rid of the cyclic dependency. It is part of the larger effort to move app/gfx/gl to ui/gfx/gl.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/6718034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79127 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/view.cc | 2 | ||||
| -rw-r--r-- | views/views.gyp | 3 | ||||
| -rw-r--r-- | views/widget/widget.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/views/view.cc b/views/view.cc index fb37767..a66587e 100644 --- a/views/view.cc +++ b/views/view.cc @@ -14,7 +14,7 @@ #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/gfx/canvas_skia.h" -#include "ui/gfx/compositor.h" +#include "ui/gfx/compositor/compositor.h" #include "ui/gfx/path.h" #include "ui/gfx/transform.h" #include "views/background.h" diff --git a/views/views.gyp b/views/views.gyp index 2ca2d25..c5706ad 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -68,8 +68,9 @@ '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', - '../ui/ui.gyp:ui_base', '../ui/base/strings/ui_strings.gyp:ui_strings', + '../ui/gfx/compositor/compositor.gyp:compositor', + '../ui/ui.gyp:ui_base', ], 'sources': [ # All .cc, .h under views, except unittests diff --git a/views/widget/widget.cc b/views/widget/widget.cc index 65b9f916..62f9cf9 100644 --- a/views/widget/widget.cc +++ b/views/widget/widget.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/message_loop.h" -#include "ui/gfx/compositor.h" +#include "ui/gfx/compositor/compositor.h" #include "views/focus/view_storage.h" #include "views/widget/default_theme_provider.h" #include "views/widget/root_view.h" |