OLD | NEW |
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "views/controls/throbber.h" | 5 #include "views/controls/throbber.h" |
6 | 6 |
7 #include "app/resource_bundle.h" | |
8 #include "base/time.h" | 7 #include "base/time.h" |
9 #include "gfx/canvas.h" | 8 #include "gfx/canvas.h" |
10 #include "grit/app_resources.h" | 9 #include "grit/app_resources.h" |
11 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
| 11 #include "ui/base/resource/resource_bundle.h" |
12 | 12 |
13 using base::Time; | 13 using base::Time; |
14 using base::TimeDelta; | 14 using base::TimeDelta; |
15 | 15 |
16 namespace views { | 16 namespace views { |
17 | 17 |
18 Throbber::Throbber(int frame_time_ms, | 18 Throbber::Throbber(int frame_time_ms, |
19 bool paint_while_stopped) | 19 bool paint_while_stopped) |
20 : running_(false), | 20 : running_(false), |
21 paint_while_stopped_(paint_while_stopped), | 21 paint_while_stopped_(paint_while_stopped), |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 167 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
168 checkmark_ = rb.GetBitmapNamed(IDR_INPUT_GOOD); | 168 checkmark_ = rb.GetBitmapNamed(IDR_INPUT_GOOD); |
169 initialized = true; | 169 initialized = true; |
170 } | 170 } |
171 } | 171 } |
172 | 172 |
173 // static | 173 // static |
174 SkBitmap* CheckmarkThrobber::checkmark_ = NULL; | 174 SkBitmap* CheckmarkThrobber::checkmark_ = NULL; |
175 | 175 |
176 } // namespace views | 176 } // namespace views |
OLD | NEW |