Chromium Code Reviews| Index: ui/views/controls/throbber.cc |
| diff --git a/ui/views/controls/throbber.cc b/ui/views/controls/throbber.cc |
| index 75d70fbfafc1053c24c302f03721160eea905867..6c576223844121f25cea9830aaa79038982e328c 100644 |
| --- a/ui/views/controls/throbber.cc |
| +++ b/ui/views/controls/throbber.cc |
| @@ -21,7 +21,8 @@ Throbber::Throbber(int frame_time_ms, |
| : running_(false), |
| paint_while_stopped_(paint_while_stopped), |
| frames_(NULL), |
| - frame_time_(TimeDelta::FromMilliseconds(frame_time_ms)) { |
| + frame_time_(TimeDelta::FromMilliseconds(frame_time_ms)), |
| + interactive_(true) { |
| SetFrames(ui::ResourceBundle::GetSharedInstance().GetImageNamed( |
| IDR_THROBBER).ToImageSkia()); |
| } |
| @@ -88,7 +89,9 @@ void Throbber::OnPaint(gfx::Canvas* canvas) { |
| false); |
| } |
| - |
| +bool Throbber::HitTestRect(const gfx::Rect& rect) const { |
| + return interactive_ ? View::HitTestRect(rect) : false; |
|
sky
2013/02/05 15:58:52
Why do you need this? Rather than adding set_inter
jennyz
2013/02/05 17:37:20
Yes, you are right, I can just use set_enabled, re
|
| +} |
| // Smoothed throbber --------------------------------------------------------- |