diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 17:36:09 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-13 17:36:09 +0000 |
| commit | b6d81261a469240e25b41e7125bb7166ca3d35bb (patch) | |
| tree | 9ddaf52100915560ce5c3d0167e79ef4a26aec56 /views/controls/tabbed_pane | |
| parent | 917a44b0724089630cb1d962a9383df7a1deaf7e (diff) | |
| download | chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.zip chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.tar.gz chromium_src-b6d81261a469240e25b41e7125bb7166ca3d35bb.tar.bz2 | |
Move app/key* to ui/base/keycodes/*
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6246001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/tabbed_pane')
| -rw-r--r-- | views/controls/tabbed_pane/tabbed_pane.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc index 429e4c4..6fb07ea 100644 --- a/views/controls/tabbed_pane/tabbed_pane.cc +++ b/views/controls/tabbed_pane/tabbed_pane.cc @@ -4,8 +4,8 @@ #include "views/controls/tabbed_pane/tabbed_pane.h" -#include "app/keyboard_codes.h" #include "base/logging.h" +#include "ui/base/keycodes/keyboard_codes.h" #include "views/controls/native/native_view_host.h" #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" @@ -82,7 +82,7 @@ void TabbedPane::ViewHierarchyChanged(bool is_add, View* parent, View* child) { bool TabbedPane::AcceleratorPressed(const views::Accelerator& accelerator) { // We only accept Ctrl+Tab keyboard events. DCHECK(accelerator.GetKeyCode() == - app::VKEY_TAB && accelerator.IsCtrlDown()); + ui::VKEY_TAB && accelerator.IsCtrlDown()); int tab_count = GetTabCount(); if (tab_count <= 1) @@ -100,9 +100,9 @@ bool TabbedPane::AcceleratorPressed(const views::Accelerator& accelerator) { void TabbedPane::LoadAccelerators() { // Ctrl+Shift+Tab - AddAccelerator(views::Accelerator(app::VKEY_TAB, true, true, false)); + AddAccelerator(views::Accelerator(ui::VKEY_TAB, true, true, false)); // Ctrl+Tab - AddAccelerator(views::Accelerator(app::VKEY_TAB, false, true, false)); + AddAccelerator(views::Accelerator(ui::VKEY_TAB, false, true, false)); } void TabbedPane::Layout() { |