Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Side by Side Diff: ui/views/controls/slider.h

Issue 10825254: Remove views::KeyEvent, replacing uses of it with ui::KeyEvent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/views/controls/scrollbar/native_scroll_bar_win.cc ('k') | ui/views/controls/slider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_SLIDER_H_ 5 #ifndef UI_VIEWS_CONTROLS_SLIDER_H_
6 #define UI_VIEWS_CONTROLS_SLIDER_H_ 6 #define UI_VIEWS_CONTROLS_SLIDER_H_
7 7
8 #include "ui/base/animation/animation_delegate.h" 8 #include "ui/base/animation/animation_delegate.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 #include "ui/views/views_export.h" 10 #include "ui/views/views_export.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 void MoveButtonTo(const gfx::Point& point); 79 void MoveButtonTo(const gfx::Point& point);
80 80
81 // views::View overrides: 81 // views::View overrides:
82 virtual gfx::Size GetPreferredSize() OVERRIDE; 82 virtual gfx::Size GetPreferredSize() OVERRIDE;
83 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; 83 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
84 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE; 84 virtual bool OnMousePressed(const views::MouseEvent& event) OVERRIDE;
85 virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE; 85 virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
86 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE; 86 virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
87 virtual ui::GestureStatus OnGestureEvent( 87 virtual ui::GestureStatus OnGestureEvent(
88 const views::GestureEvent& event) OVERRIDE; 88 const views::GestureEvent& event) OVERRIDE;
89 virtual bool OnKeyPressed(const views::KeyEvent& event) OVERRIDE; 89 virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
90 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; 90 virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
91 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE; 91 virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
92 92
93 // ui::AnimationDelegate overrides: 93 // ui::AnimationDelegate overrides:
94 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 94 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
95 95
96 SliderListener* listener_; 96 SliderListener* listener_;
97 Orientation orientation_; 97 Orientation orientation_;
98 98
99 scoped_ptr<ui::SlideAnimation> move_animation_; 99 scoped_ptr<ui::SlideAnimation> move_animation_;
(...skipping 11 matching lines...) Expand all
111 const gfx::ImageSkia* thumb_; 111 const gfx::ImageSkia* thumb_;
112 const gfx::ImageSkia* images_[4]; 112 const gfx::ImageSkia* images_[4];
113 int bar_height_; 113 int bar_height_;
114 114
115 DISALLOW_COPY_AND_ASSIGN(Slider); 115 DISALLOW_COPY_AND_ASSIGN(Slider);
116 }; 116 };
117 117
118 } // namespace views 118 } // namespace views
119 119
120 #endif // UI_VIEWS_CONTROLS_SLIDER_H_ 120 #endif // UI_VIEWS_CONTROLS_SLIDER_H_
OLDNEW
« no previous file with comments | « ui/views/controls/scrollbar/native_scroll_bar_win.cc ('k') | ui/views/controls/slider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698