diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:38:27 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:38:27 +0000 |
| commit | 7f05552488f8f9ea5000512fd1972894aee7ee82 (patch) | |
| tree | 0e2ed5a562335907e44307a1d99e9c6ab8d8a3ec /views/controls/scrollbar/bitmap_scroll_bar.cc | |
| parent | 9d7e8fd4a448491817b816585d6f375d71c0a97a (diff) | |
| download | chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.zip chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.tar.gz chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.tar.bz2 | |
Re-lands 58186:
Original message:
"""
Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::.
TEST=try bots compile
BUG=NONE
Review URL: http://codereview.chromium.org/3165064
"""
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3354005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/scrollbar/bitmap_scroll_bar.cc')
| -rw-r--r-- | views/controls/scrollbar/bitmap_scroll_bar.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc index d5ac40c..d170b50 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; } |