diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 01:32:00 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 01:32:00 +0000 |
| commit | 48977d584e9516d70222e5c9b62c01e3516b5283 (patch) | |
| tree | 92751c3d38a0db9ca1eb1b5eecf20ff7ab773a97 /ui/aura_shell/launcher | |
| parent | 5b14c320879a30f95c2ba55b32b5ab55f56c43c4 (diff) | |
| download | chromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.zip chromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.tar.gz chromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.tar.bz2 | |
views: Move button directory to ui/views/controls/.
BUG=104039
R=maruel@chromium.org
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8716001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell/launcher')
| -rw-r--r-- | ui/aura_shell/launcher/app_launcher_button.h | 2 | ||||
| -rw-r--r-- | ui/aura_shell/launcher/launcher_view.cc | 2 | ||||
| -rw-r--r-- | ui/aura_shell/launcher/launcher_view.h | 2 | ||||
| -rw-r--r-- | ui/aura_shell/launcher/tabbed_launcher_button.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/aura_shell/launcher/app_launcher_button.h b/ui/aura_shell/launcher/app_launcher_button.h index ff6ad11..125853d 100644 --- a/ui/aura_shell/launcher/app_launcher_button.h +++ b/ui/aura_shell/launcher/app_launcher_button.h @@ -6,7 +6,7 @@ #define UI_AURA_SHELL_LAUNCHER_APP_LAUNCHER_BUTTON_H_ #pragma once -#include "views/controls/button/image_button.h" +#include "ui/views/controls/button/image_button.h" namespace aura_shell { namespace internal { diff --git a/ui/aura_shell/launcher/launcher_view.cc b/ui/aura_shell/launcher/launcher_view.cc index 117b300..3715b6d 100644 --- a/ui/aura_shell/launcher/launcher_view.cc +++ b/ui/aura_shell/launcher/launcher_view.cc @@ -21,8 +21,8 @@ #include "ui/gfx/compositor/layer.h" #include "ui/gfx/image/image.h" #include "ui/views/animation/bounds_animator.h" +#include "ui/views/controls/button/image_button.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" diff --git a/ui/aura_shell/launcher/launcher_view.h b/ui/aura_shell/launcher/launcher_view.h index c4279aa0..8461921 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/controls/button/button.h" #include "ui/views/widget/widget_delegate.h" -#include "views/controls/button/button.h" namespace views { class BoundsAnimator; diff --git a/ui/aura_shell/launcher/tabbed_launcher_button.h b/ui/aura_shell/launcher/tabbed_launcher_button.h index f8ec69d..5534e1f 100644 --- a/ui/aura_shell/launcher/tabbed_launcher_button.h +++ b/ui/aura_shell/launcher/tabbed_launcher_button.h @@ -7,7 +7,7 @@ #pragma once #include "ui/aura_shell/launcher/launcher_types.h" -#include "views/controls/button/custom_button.h" +#include "ui/views/controls/button/custom_button.h" namespace aura_shell { namespace internal { |