Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: views/controls/tabbed_pane/tabbed_pane.cc

Issue 3165064: Move the keyboard files from base/ to app/. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: latest merge Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/scrollbar/native_scroll_bar_win.cc ('k') | views/controls/table/group_table_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/tabbed_pane/tabbed_pane.cc
diff --git a/views/controls/tabbed_pane/tabbed_pane.cc b/views/controls/tabbed_pane/tabbed_pane.cc
index 110b1348751a2e7c1ec574e5201a93261b2d0141..8061821669f253d676d97c28449a4ae3411403d8 100644
--- a/views/controls/tabbed_pane/tabbed_pane.cc
+++ b/views/controls/tabbed_pane/tabbed_pane.cc
@@ -4,7 +4,7 @@
#include "views/controls/tabbed_pane/tabbed_pane.h"
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
#include "base/logging.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() ==
- base::VKEY_TAB && accelerator.IsCtrlDown());
+ app::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(base::VKEY_TAB, true, true, false));
+ AddAccelerator(views::Accelerator(app::VKEY_TAB, true, true, false));
// Ctrl+Tab
- AddAccelerator(views::Accelerator(base::VKEY_TAB, false, true, false));
+ AddAccelerator(views::Accelerator(app::VKEY_TAB, false, true, false));
}
void TabbedPane::Layout() {
« no previous file with comments | « views/controls/scrollbar/native_scroll_bar_win.cc ('k') | views/controls/table/group_table_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698