diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 15:33:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 15:33:33 +0000 |
| commit | 5e554e8fbf652534b50c89e2ffafaeb96161cc80 (patch) | |
| tree | 26750feec0b3e886ee55f5b8b3eee37414aa1860 /ui/aura_shell | |
| parent | 23b8a3ca4a6f95b5f9e8fd9ae0553ad141b8e991 (diff) | |
| download | chromium_src-5e554e8fbf652534b50c89e2ffafaeb96161cc80.zip chromium_src-5e554e8fbf652534b50c89e2ffafaeb96161cc80.tar.gz chromium_src-5e554e8fbf652534b50c89e2ffafaeb96161cc80.tar.bz2 | |
views: Move menu directory to ui/views/controls/.
BUG=104039
R=maruel@chromium.org
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8718004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111701 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura_shell')
| -rw-r--r-- | ui/aura_shell/examples/window_type_launcher.cc | 4 | ||||
| -rw-r--r-- | ui/aura_shell/examples/window_type_launcher.h | 2 | ||||
| -rw-r--r-- | ui/aura_shell/launcher/launcher_view.cc | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ui/aura_shell/examples/window_type_launcher.cc b/ui/aura_shell/examples/window_type_launcher.cc index fbf38ff..394e9c1 100644 --- a/ui/aura_shell/examples/window_type_launcher.cc +++ b/ui/aura_shell/examples/window_type_launcher.cc @@ -14,9 +14,9 @@ #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" #include "ui/views/widget/widget.h" -#include "views/controls/menu/menu_item_view.h" -#include "views/controls/menu/menu_runner.h" using views::MenuItemView; using views::MenuRunner; diff --git a/ui/aura_shell/examples/window_type_launcher.h b/ui/aura_shell/examples/window_type_launcher.h index 5cdfa89..a684400 100644 --- a/ui/aura_shell/examples/window_type_launcher.h +++ b/ui/aura_shell/examples/window_type_launcher.h @@ -7,9 +7,9 @@ #pragma once #include "ui/views/controls/button/button.h" +#include "ui/views/controls/menu/menu_delegate.h" #include "ui/views/widget/widget_delegate.h" #include "views/context_menu_controller.h" -#include "views/controls/menu/menu_delegate.h" namespace views { class MenuRunner; diff --git a/ui/aura_shell/launcher/launcher_view.cc b/ui/aura_shell/launcher/launcher_view.cc index 3715b6d..727c9fc 100644 --- a/ui/aura_shell/launcher/launcher_view.cc +++ b/ui/aura_shell/launcher/launcher_view.cc @@ -22,9 +22,9 @@ #include "ui/gfx/image/image.h" #include "ui/views/animation/bounds_animator.h" #include "ui/views/controls/button/image_button.h" +#include "ui/views/controls/menu/menu_model_adapter.h" +#include "ui/views/controls/menu/menu_runner.h" #include "ui/views/widget/widget.h" -#include "views/controls/menu/menu_model_adapter.h" -#include "views/controls/menu/menu_runner.h" using ui::Animation; using views::View; |