diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 02:09:58 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 02:09:58 +0000 |
| commit | c13be0d2381881a8ee2a90fecb8c74757972889c (patch) | |
| tree | 98f9808c5492cd76b79bfc8e80585be395830cbb /ui/aura_shell/launcher | |
| parent | c0cfa519feb222571f5d046eb448aa422466bf45 (diff) | |
| download | chromium_src-c13be0d2381881a8ee2a90fecb8c74757972889c.zip chromium_src-c13be0d2381881a8ee2a90fecb8c74757972889c.tar.gz chromium_src-c13be0d2381881a8ee2a90fecb8c74757972889c.tar.bz2 | |
views: Move widget/ directory to ui/views.
BUG=104039
R=ben@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=110949
Review URL: http://codereview.chromium.org/8598031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/launcher')
| -rw-r--r-- | ui/aura_shell/launcher/launcher.cc | 2 | ||||
| -rw-r--r-- | ui/aura_shell/launcher/launcher_view.cc | 2 | ||||
| -rw-r--r-- | ui/aura_shell/launcher/launcher_view.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ui/aura_shell/launcher/launcher.cc b/ui/aura_shell/launcher/launcher.cc index 1adde4c..64a6c88 100644 --- a/ui/aura_shell/launcher/launcher.cc +++ b/ui/aura_shell/launcher/launcher.cc @@ -11,7 +11,7 @@ #include "ui/aura_shell/shell_delegate.h" #include "ui/aura_shell/shell_window_ids.h" #include "ui/gfx/compositor/layer.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace aura_shell { diff --git a/ui/aura_shell/launcher/launcher_view.cc b/ui/aura_shell/launcher/launcher_view.cc index 46a0b07..117b300 100644 --- a/ui/aura_shell/launcher/launcher_view.cc +++ b/ui/aura_shell/launcher/launcher_view.cc @@ -21,10 +21,10 @@ #include "ui/gfx/compositor/layer.h" #include "ui/gfx/image/image.h" #include "ui/views/animation/bounds_animator.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/image_button.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" using ui::Animation; using views::View; diff --git a/ui/aura_shell/launcher/launcher_view.h b/ui/aura_shell/launcher/launcher_view.h index a2f63b3..c4279aa0 100644 --- a/ui/aura_shell/launcher/launcher_view.h +++ b/ui/aura_shell/launcher/launcher_view.h @@ -10,8 +10,8 @@ #include "ui/aura_shell/launcher/launcher_button_host.h" #include "ui/aura_shell/launcher/launcher_model_observer.h" +#include "ui/views/widget/widget_delegate.h" #include "views/controls/button/button.h" -#include "views/widget/widget_delegate.h" namespace views { class BoundsAnimator; |