diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 21:55:34 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-13 21:55:34 +0000 |
| commit | 624a7c26750b6e235f0f3cb7f7d41fedc63aed49 (patch) | |
| tree | 71db7c199b077bc669b65e1b31cb24cd786d3e95 /ui/views/controls/scrollbar | |
| parent | be97971472298304f78e61df3c7a960e25f7911b (diff) | |
| download | chromium_src-624a7c26750b6e235f0f3cb7f7d41fedc63aed49.zip chromium_src-624a7c26750b6e235f0f3cb7f7d41fedc63aed49.tar.gz chromium_src-624a7c26750b6e235f0f3cb7f7d41fedc63aed49.tar.bz2 | |
Replace views::LocatedEvent with ui::LocatedEvent
http://crbug.com/125937
TBR=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10828265
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151362 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/scrollbar')
| -rw-r--r-- | ui/views/controls/scrollbar/base_scroll_bar.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/scrollbar/base_scroll_bar.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/controls/scrollbar/base_scroll_bar.cc b/ui/views/controls/scrollbar/base_scroll_bar.cc index f572ef0..6a0e8e7 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.cc +++ b/ui/views/controls/scrollbar/base_scroll_bar.cc @@ -373,7 +373,7 @@ int BaseScrollBar::GetScrollIncrement(bool is_page, bool is_positive) { /////////////////////////////////////////////////////////////////////////////// // BaseScrollBar, private: -void BaseScrollBar::ProcessPressEvent(const LocatedEvent& event) { +void BaseScrollBar::ProcessPressEvent(const ui::LocatedEvent& event) { SetThumbTrackState(CustomButton::BS_PUSHED); gfx::Rect thumb_bounds = thumb_->bounds(); if (IsHorizontal()) { diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h index da56b6e..3eab16d 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.h +++ b/ui/views/controls/scrollbar/base_scroll_bar.h @@ -99,7 +99,7 @@ class VIEWS_EXPORT BaseScrollBar : public ScrollBar, private: // Changes to 'pushed' state and starts a timer to scroll repeatedly. - void ProcessPressEvent(const LocatedEvent& event); + void ProcessPressEvent(const ui::LocatedEvent& event); // Resets state to 'normal' and stops the repeater. void ResetState(); |