diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 23:41:48 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-09 23:41:48 +0000 |
commit | 981e66948a84c10067e9064b6ef482ba5bb277cf (patch) | |
tree | c67dd1a65eee9d5174c4bfdd269f6bdc2acac430 /views/controls/scrollbar | |
parent | e2e88e7f5dbcbb2367d632b534ca0e75aab9f25c (diff) | |
download | chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.zip chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.tar.gz chromium_src-981e66948a84c10067e9064b6ef482ba5bb277cf.tar.bz2 |
Revert 74377 - Migrate Event API methods to Google Style.
BUG=72040
TEST=none
Review URL: http://codereview.chromium.org/6480001
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/6469014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/scrollbar')
-rw-r--r-- | views/controls/scrollbar/bitmap_scroll_bar.cc | 4 | ||||
-rw-r--r-- | views/controls/scrollbar/native_scroll_bar_gtk.cc | 4 | ||||
-rw-r--r-- | views/controls/scrollbar/native_scroll_bar_win.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc index a60d666..cf0e919 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -491,13 +491,13 @@ void BitmapScrollBar::OnMouseReleased(const MouseEvent& event, bool canceled) { } bool BitmapScrollBar::OnMouseWheel(const MouseWheelEvent& event) { - ScrollByContentsOffset(event.offset()); + ScrollByContentsOffset(event.GetOffset()); return true; } bool BitmapScrollBar::OnKeyPressed(const KeyEvent& event) { ScrollAmount amount = SCROLL_NONE; - switch (event.key_code()) { + switch (event.GetKeyCode()) { case ui::VKEY_UP: if (!IsHorizontal()) amount = SCROLL_PREV_LINE; diff --git a/views/controls/scrollbar/native_scroll_bar_gtk.cc b/views/controls/scrollbar/native_scroll_bar_gtk.cc index dc1a9b6..73bb109 100644 --- a/views/controls/scrollbar/native_scroll_bar_gtk.cc +++ b/views/controls/scrollbar/native_scroll_bar_gtk.cc @@ -44,7 +44,7 @@ gfx::Size NativeScrollBarGtk::GetPreferredSize() { bool NativeScrollBarGtk::OnKeyPressed(const KeyEvent& event) { if (!native_view()) return false; - switch (event.key_code()) { + switch (event.GetKeyCode()) { case ui::VKEY_UP: if (!native_scroll_bar_->IsHorizontal()) MoveStep(false /* negative */); @@ -82,7 +82,7 @@ bool NativeScrollBarGtk::OnKeyPressed(const KeyEvent& event) { bool NativeScrollBarGtk::OnMouseWheel(const MouseWheelEvent& e) { if (!native_view()) return false; - MoveBy(-e.offset()); // e.GetOffset() > 0 means scroll up. + MoveBy(-e.GetOffset()); // e.GetOffset() > 0 means scroll up. return true; } diff --git a/views/controls/scrollbar/native_scroll_bar_win.cc b/views/controls/scrollbar/native_scroll_bar_win.cc index 01cd5f8..44d8bf6 100644 --- a/views/controls/scrollbar/native_scroll_bar_win.cc +++ b/views/controls/scrollbar/native_scroll_bar_win.cc @@ -230,7 +230,7 @@ bool NativeScrollBarWin::OnKeyPressed(const KeyEvent& event) { if (!sb_container_.get()) return false; int code = -1; - switch (event.key_code()) { + switch (event.GetKeyCode()) { case ui::VKEY_UP: if (!native_scroll_bar_->IsHorizontal()) code = SB_LINEUP; @@ -272,7 +272,7 @@ bool NativeScrollBarWin::OnKeyPressed(const KeyEvent& event) { bool NativeScrollBarWin::OnMouseWheel(const MouseWheelEvent& e) { if (!sb_container_.get()) return false; - sb_container_->ScrollWithOffset(e.offset()); + sb_container_->ScrollWithOffset(e.GetOffset()); return true; } |