| OLD | NEW |
| 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 #include "ui/views/controls/throbber.h" | 5 #include "ui/views/controls/throbber.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "ui/base/resource/resource_bundle.h" | 9 #include "ui/base/resource/resource_bundle.h" |
| 10 #include "ui/gfx/animation/tween.h" | 10 #include "ui/gfx/animation/tween.h" |
| 11 #include "ui/gfx/canvas.h" | 11 #include "ui/gfx/canvas.h" |
| 12 #include "ui/gfx/image/image.h" | 12 #include "ui/gfx/image/image.h" |
| 13 #include "ui/gfx/image/image_skia.h" | 13 #include "ui/gfx/image/image_skia.h" |
| 14 #include "ui/gfx/paint_throbber.h" | 14 #include "ui/gfx/paint_throbber.h" |
| 15 #include "ui/gfx/paint_vector_icon.h" | 15 #include "ui/gfx/paint_vector_icon.h" |
| 16 #include "ui/native_theme/common_theme.h" | 16 #include "ui/native_theme/common_theme.h" |
| 17 #include "ui/native_theme/native_theme.h" | 17 #include "ui/native_theme/native_theme.h" |
| 18 #include "ui/resources/grit/ui_resources.h" | |
| 19 #include "ui/vector_icons/vector_icons.h" | 18 #include "ui/vector_icons/vector_icons.h" |
| 20 #include "ui/views/resources/grit/views_resources.h" | |
| 21 | 19 |
| 22 namespace views { | 20 namespace views { |
| 23 | 21 |
| 24 // The default diameter of a Throbber. If you change this, also change | 22 // The default diameter of a Throbber. If you change this, also change |
| 25 // kCheckmarkDipSize. | 23 // kCheckmarkDipSize. |
| 26 static const int kDefaultDiameter = 16; | 24 static const int kDefaultDiameter = 16; |
| 27 // The size of the checkmark, in DIP. This magic number matches the default | 25 // The size of the checkmark, in DIP. This magic number matches the default |
| 28 // diamater plus padding inherent in the checkmark SVG. | 26 // diamater plus padding inherent in the checkmark SVG. |
| 29 static const int kCheckmarkDipSize = 18; | 27 static const int kCheckmarkDipSize = 18; |
| 30 | 28 |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 stop_timer_.Start(FROM_HERE, | 122 stop_timer_.Start(FROM_HERE, |
| 125 base::TimeDelta::FromMilliseconds(stop_delay_ms_), this, | 123 base::TimeDelta::FromMilliseconds(stop_delay_ms_), this, |
| 126 &SmoothedThrobber::StopDelayOver); | 124 &SmoothedThrobber::StopDelayOver); |
| 127 } | 125 } |
| 128 | 126 |
| 129 void SmoothedThrobber::StopDelayOver() { | 127 void SmoothedThrobber::StopDelayOver() { |
| 130 Throbber::Stop(); | 128 Throbber::Stop(); |
| 131 } | 129 } |
| 132 | 130 |
| 133 } // namespace views | 131 } // namespace views |
| OLD | NEW |