From 2b7c9492e9a8794e2124da62bfce91fe3a1b2a77 Mon Sep 17 00:00:00 2001 From: "bryeung@chromium.org" Date: Thu, 2 Sep 2010 19:22:15 +0000 Subject: Revert 58215 - Revert 58186 - 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=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58388 0039d316-1c4b-4281-b951-d872f2087c98 --- views/controls/scrollbar/bitmap_scroll_bar.cc | 18 +++++++++--------- views/controls/scrollbar/native_scroll_bar_gtk.cc | 18 +++++++++--------- views/controls/scrollbar/native_scroll_bar_win.cc | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'views/controls/scrollbar') 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; } diff --git a/views/controls/scrollbar/native_scroll_bar_gtk.cc b/views/controls/scrollbar/native_scroll_bar_gtk.cc index c5d75c8..6f318ec 100644 --- a/views/controls/scrollbar/native_scroll_bar_gtk.cc +++ b/views/controls/scrollbar/native_scroll_bar_gtk.cc @@ -6,7 +6,7 @@ #include -#include "base/keyboard_codes_posix.h" +#include "app/keyboard_codes_posix.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/controls/scrollbar/scroll_bar.h" @@ -45,32 +45,32 @@ bool NativeScrollBarGtk::OnKeyPressed(const KeyEvent& event) { if (!native_view()) return false; switch (event.GetKeyCode()) { - case base::VKEY_UP: + case app::VKEY_UP: if (!native_scroll_bar_->IsHorizontal()) MoveStep(false /* negative */); break; - case base::VKEY_DOWN: + case app::VKEY_DOWN: if (!native_scroll_bar_->IsHorizontal()) MoveStep(true /* positive */); break; - case base::VKEY_LEFT: + case app::VKEY_LEFT: if (native_scroll_bar_->IsHorizontal()) MoveStep(false /* negative */); break; - case base::VKEY_RIGHT: + case app::VKEY_RIGHT: if (native_scroll_bar_->IsHorizontal()) MoveStep(true /* positive */); break; - case base::VKEY_PRIOR: + case app::VKEY_PRIOR: MovePage(false /* negative */); break; - case base::VKEY_NEXT: + case app::VKEY_NEXT: MovePage(true /* positive */); break; - case base::VKEY_HOME: + case app::VKEY_HOME: MoveTo(0); break; - case base::VKEY_END: + case app::VKEY_END: MoveToBottom(); break; default: diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc index 65350e0..55592a8a 100644 --- a/views/controls/scrollbar/native_scroll_bar_win.cc +++ b/views/controls/scrollbar/native_scroll_bar_win.cc @@ -7,7 +7,7 @@ #include #include -#include "base/keyboard_codes.h" +#include "app/keyboard_codes.h" #include "base/message_loop.h" #include "gfx/window_impl.h" #include "views/controls/scrollbar/native_scroll_bar.h" @@ -231,31 +231,31 @@ bool NativeScrollBarWin::OnKeyPressed(const KeyEvent& event) { return false; int code = -1; switch (event.GetKeyCode()) { - case base::VKEY_UP: + case app::VKEY_UP: if (!native_scroll_bar_->IsHorizontal()) code = SB_LINEUP; break; - case base::VKEY_PRIOR: + case app::VKEY_PRIOR: code = SB_PAGEUP; break; - case base::VKEY_NEXT: + case app::VKEY_NEXT: code = SB_PAGEDOWN; break; - case base::VKEY_DOWN: + case app::VKEY_DOWN: if (!native_scroll_bar_->IsHorizontal()) code = SB_LINEDOWN; break; - case base::VKEY_HOME: + case app::VKEY_HOME: code = SB_TOP; break; - case base::VKEY_END: + case app::VKEY_END: code = SB_BOTTOM; break; - case base::VKEY_LEFT: + case app::VKEY_LEFT: if (native_scroll_bar_->IsHorizontal()) code = SB_LINELEFT; break; - case base::VKEY_RIGHT: + case app::VKEY_RIGHT: if (native_scroll_bar_->IsHorizontal()) code = SB_LINERIGHT; break; -- cgit v1.1