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

Unified Diff: views/controls/scrollbar/bitmap_scroll_bar.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/native_control.cc ('k') | views/controls/scrollbar/native_scroll_bar_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/scrollbar/bitmap_scroll_bar.cc
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index d5ac40cc4c2e45f566bff3ae68a2f8f918a3ae8b..d170b506a1af073a4773b6c2f5aaa5b5824d4d70 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -8,10 +8,10 @@
#include "views/screen.h"
#endif
+#include "app/keyboard_codes.h"
#include "app/l10n_util.h"
#include "base/callback.h"
#include "base/compiler_specific.h"
-#include "base/keyboard_codes.h"
#include "base/message_loop.h"
#include "gfx/canvas.h"
#include "grit/app_strings.h"
@@ -496,32 +496,32 @@ bool BitmapScrollBar::OnMouseWheel(const MouseWheelEvent& event) {
bool BitmapScrollBar::OnKeyPressed(const KeyEvent& event) {
ScrollAmount amount = SCROLL_NONE;
switch (event.GetKeyCode()) {
- case base::VKEY_UP:
+ case app::VKEY_UP:
if (!IsHorizontal())
amount = SCROLL_PREV_LINE;
break;
- case base::VKEY_DOWN:
+ case app::VKEY_DOWN:
if (!IsHorizontal())
amount = SCROLL_NEXT_LINE;
break;
- case base::VKEY_LEFT:
+ case app::VKEY_LEFT:
if (IsHorizontal())
amount = SCROLL_PREV_LINE;
break;
- case base::VKEY_RIGHT:
+ case app::VKEY_RIGHT:
if (IsHorizontal())
amount = SCROLL_NEXT_LINE;
break;
- case base::VKEY_PRIOR:
+ case app::VKEY_PRIOR:
amount = SCROLL_PREV_PAGE;
break;
- case base::VKEY_NEXT:
+ case app::VKEY_NEXT:
amount = SCROLL_NEXT_PAGE;
break;
- case base::VKEY_HOME:
+ case app::VKEY_HOME:
amount = SCROLL_START;
break;
- case base::VKEY_END:
+ case app::VKEY_END:
amount = SCROLL_END;
break;
}
« no previous file with comments | « views/controls/native_control.cc ('k') | views/controls/scrollbar/native_scroll_bar_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698