diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 21:01:14 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-15 21:01:14 +0000 |
| commit | ebaf09fc99d68821c265297499a64246222bf64d (patch) | |
| tree | fa92c24dd800064692dfd8bb7846b26abd09635a /ui/aura_shell/launcher | |
| parent | dfb6089698f447ef9d564e0222a8137b0c017321 (diff) | |
| download | chromium_src-ebaf09fc99d68821c265297499a64246222bf64d.zip chromium_src-ebaf09fc99d68821c265297499a64246222bf64d.tar.gz chromium_src-ebaf09fc99d68821c265297499a64246222bf64d.tar.bz2 | |
views: Move more two directories into ui/views/.
BUG=104039
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8572016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110162 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/launcher')
| -rw-r--r-- | ui/aura_shell/launcher/launcher_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/aura_shell/launcher/launcher_view.cc b/ui/aura_shell/launcher/launcher_view.cc index 6d22e5a..b6fb445 100644 --- a/ui/aura_shell/launcher/launcher_view.cc +++ b/ui/aura_shell/launcher/launcher_view.cc @@ -6,6 +6,7 @@ #include "base/utf_string_conversions.h" #include "grit/ui_resources.h" +#include "ui/aura/window.h" #include "ui/aura_shell/launcher/app_launcher_button.h" #include "ui/aura_shell/launcher/launcher_model.h" #include "ui/aura_shell/launcher/tabbed_launcher_button.h" @@ -13,14 +14,13 @@ #include "ui/aura_shell/launcher/view_model_utils.h" #include "ui/aura_shell/shell.h" #include "ui/aura_shell/shell_delegate.h" -#include "ui/aura/window.h" #include "ui/base/animation/animation.h" #include "ui/base/animation/throb_animation.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/image/image.h" -#include "views/animation/bounds_animator.h" +#include "ui/views/animation/bounds_animator.h" #include "views/controls/button/image_button.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" |