From d57afa518d4ad5192b5a2d0f7227b2ddebd21ab9 Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Mon, 21 Nov 2011 17:18:14 +0000 Subject: views: Move widget/ directory to ui/views. BUG=104039 R=ben@chromium.org Review URL: http://codereview.chromium.org/8598031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110949 0039d316-1c4b-4281-b951-d872f2087c98 --- ui/aura_shell/launcher/launcher.cc | 2 +- ui/aura_shell/launcher/launcher_view.cc | 2 +- ui/aura_shell/launcher/launcher_view.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ui/aura_shell/launcher') 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 b6fb445..d9db9f4 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; -- cgit v1.1