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/shell | |
| 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/shell')
| -rw-r--r-- | ash/shell/content_client/shell_browser_main_parts.cc | 6 | ||||
| -rw-r--r-- | ash/shell/window_type_launcher.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ash/shell/content_client/shell_browser_main_parts.cc b/ash/shell/content_client/shell_browser_main_parts.cc index 2aaaed2..2ce1d23 100644 --- a/ash/shell/content_client/shell_browser_main_parts.cc +++ b/ash/shell/content_client/shell_browser_main_parts.cc @@ -27,10 +27,10 @@ #include "ui/base/clipboard/clipboard.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" -#include "ui/gfx/compositor/compositor.h" -#include "ui/gfx/compositor/test/compositor_test_support.h" -#include "ui/views/test/test_views_delegate.h" +#include "ui/compositor/compositor.h" +#include "ui/compositor/test/compositor_test_support.h" #include "ui/views/focus/accelerator_handler.h" +#include "ui/views/test/test_views_delegate.h" namespace ash { namespace shell { diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index 020ec00..243273a 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc @@ -6,11 +6,11 @@ #include "ash/screensaver/screensaver_view.h" #include "ash/shell.h" -#include "ash/shell_delegate.h" -#include "ash/shell_window_ids.h" #include "ash/shell/example_factory.h" #include "ash/shell/panel_window.h" #include "ash/shell/toplevel_window.h" +#include "ash/shell_delegate.h" +#include "ash/shell_window_ids.h" #include "ash/wm/shadow_types.h" #include "base/bind.h" #include "base/time.h" @@ -18,8 +18,8 @@ #include "content/public/browser/browser_thread.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" +#include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" -#include "ui/gfx/compositor/layer.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" |