X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fui%2Fviews%2Fcontrols%2Fscrollbar%2Fbase_scroll_bar.cc;h=117fe345dffea247bef217e0c73e1210d7ea7b24;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=c93f48e2bb540466047de39c048ac3e03eb74de3;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/ui/views/controls/scrollbar/base_scroll_bar.cc b/src/ui/views/controls/scrollbar/base_scroll_bar.cc index c93f48e..117fe34 100644 --- a/src/ui/views/controls/scrollbar/base_scroll_bar.cc +++ b/src/ui/views/controls/scrollbar/base_scroll_bar.cc @@ -12,12 +12,12 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" -#include "grit/ui_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" #include "ui/gfx/geometry/safe_integer_conversions.h" +#include "ui/strings/grit/ui_strings.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/scroll_view.h" @@ -194,7 +194,7 @@ bool BaseScrollBar::OnKeyPressed(const ui::KeyEvent& event) { } bool BaseScrollBar::OnMouseWheel(const ui::MouseWheelEvent& event) { - ScrollByContentsOffset(event.y_offset()); + OnScroll(event.x_offset(), event.y_offset()); return true; }