diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 15:02:11 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 15:02:11 +0000 |
| commit | 2b68f8170eac47782a7680fc97b44886e27ac2fe (patch) | |
| tree | 4ac3bd72425f89bed4226f0d724d089362c5ede3 /views | |
| parent | 3138146004b13a2f1a249da15531d96a53f3e2d2 (diff) | |
| download | chromium_src-2b68f8170eac47782a7680fc97b44886e27ac2fe.zip chromium_src-2b68f8170eac47782a7680fc97b44886e27ac2fe.tar.gz chromium_src-2b68f8170eac47782a7680fc97b44886e27ac2fe.tar.bz2 | |
Move accelerator related files to ui/base/accelerators
BUG=104599
R=mazda@chromium.org
Review URL: http://codereview.chromium.org/8695005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/accessible_pane_view.h | 2 | ||||
| -rw-r--r-- | views/accessible_pane_view_unittest.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/menu_win.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/native_menu_gtk.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/native_menu_win.cc | 2 | ||||
| -rw-r--r-- | views/view.h | 2 | ||||
| -rw-r--r-- | views/view_unittest.cc | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/views/accessible_pane_view.h b/views/accessible_pane_view.h index 80c098b..655ebd9 100644 --- a/views/accessible_pane_view.h +++ b/views/accessible_pane_view.h @@ -9,7 +9,7 @@ #include "base/hash_tables.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/views/focus/focus_manager.h" #include "views/view.h" diff --git a/views/accessible_pane_view_unittest.cc b/views/accessible_pane_view_unittest.cc index 96b8b09..e51e470 100644 --- a/views/accessible_pane_view_unittest.cc +++ b/views/accessible_pane_view_unittest.cc @@ -4,7 +4,7 @@ #include "views/accessible_pane_view.h" -#include "ui/base/models/accelerator.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/test/views_test_base.h" #include "ui/views/widget/widget.h" diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index f08ddd1..66a1993 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -9,10 +9,10 @@ #include "base/logging.h" #include "base/stl_util.h" #include "base/string_util.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" -#include "ui/base/models/accelerator.h" #include "ui/base/win/window_impl.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" diff --git a/views/controls/menu/native_menu_gtk.cc b/views/controls/menu/native_menu_gtk.cc index 62d05cb..7269775 100644 --- a/views/controls/menu/native_menu_gtk.cc +++ b/views/controls/menu/native_menu_gtk.cc @@ -14,9 +14,9 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" #include "ui/base/models/menu_model.h" #include "ui/gfx/font.h" #include "ui/gfx/gtk_util.h" diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index 1b6e738..5081d92 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -13,10 +13,10 @@ #include "base/string_util.h" #include "base/win/wrapped_window_proc.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_win.h" -#include "ui/base/models/accelerator.h" #include "ui/base/win/hwnd_util.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" diff --git a/views/view.h b/views/view.h index bbb10a8..e93a125 100644 --- a/views/view.h +++ b/views/view.h @@ -17,8 +17,8 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/models/accelerator.h" #include "ui/gfx/compositor/layer_delegate.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" diff --git a/views/view_unittest.cc b/views/view_unittest.cc index 1eabedd..c948c3d 100644 --- a/views/view_unittest.cc +++ b/views/view_unittest.cc @@ -9,9 +9,9 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "testing/gmock/include/gmock/gmock.h" +#include "ui/base/accelerators/accelerator.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/keycodes/keyboard_codes.h" -#include "ui/base/models/accelerator.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/compositor/compositor.h" |