summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 23:39:00 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-04 23:39:00 +0000
commit8ace8546135af72719c8d8dffd903fd5715e5783 (patch)
treef0304b057c22768de915736b6faec1beaf1bffc4 /views
parentfb3158d1941397fc7183021782c4bceb9a02d587 (diff)
downloadchromium_src-8ace8546135af72719c8d8dffd903fd5715e5783.zip
chromium_src-8ace8546135af72719c8d8dffd903fd5715e5783.tar.gz
chromium_src-8ace8546135af72719c8d8dffd903fd5715e5783.tar.bz2
Fixing a compilation error in toolkit_views.
BUG=None TEST=None TBR=sky Review URL: http://codereview.chromium.org/160615 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/tabbed_pane/tabbed_pane.cc8
1 files changed, 5 insertions, 3 deletions
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index 78ed6d2..5ea39cf 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/views/controls/tabbed_pane/tabbed_pane.cc
@@ -4,6 +4,7 @@
#include "views/controls/tabbed_pane/tabbed_pane.h"
+#include "base/keyboard_codes.h"
#include "base/logging.h"
#include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h"
@@ -74,7 +75,8 @@ 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() == VK_TAB && accelerator.IsCtrlDown());
+ DCHECK(accelerator.GetKeyCode() ==
+ base::VKEY_TAB && accelerator.IsCtrlDown());
int tab_count = GetTabCount();
if (tab_count <= 1)
@@ -92,9 +94,9 @@ bool TabbedPane::AcceleratorPressed(const views::Accelerator& accelerator) {
void TabbedPane::LoadAccelerators() {
// Ctrl+Shift+Tab
- AddAccelerator(views::Accelerator(VK_TAB, true, true, false));
+ AddAccelerator(views::Accelerator(base::VKEY_TAB, true, true, false));
// Ctrl+Tab
- AddAccelerator(views::Accelerator(VK_TAB, false, true, false));
+ AddAccelerator(views::Accelerator(base::VKEY_TAB, false, true, false));
}
void TabbedPane::Layout() {