| OLD | NEW |
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "ui/views/controls/throbber.h" |
| 6 | 6 |
| 7 #include "base/time.h" | 7 #include "base/time.h" |
| 8 #include "grit/ui_resources.h" | 8 #include "grit/ui_resources.h" |
| 9 #include "third_party/skia/include/core/SkBitmap.h" | 9 #include "third_party/skia/include/core/SkBitmap.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| 11 #include "ui/gfx/canvas.h" | 11 #include "ui/gfx/canvas.h" |
| 12 | 12 |
| 13 using base::Time; | 13 using base::Time; |
| 14 using base::TimeDelta; | 14 using base::TimeDelta; |
| 15 | 15 |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); | 169 ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |
| 170 checkmark_ = rb.GetBitmapNamed(IDR_CHECKMARK); | 170 checkmark_ = rb.GetBitmapNamed(IDR_CHECKMARK); |
| 171 initialized = true; | 171 initialized = true; |
| 172 } | 172 } |
| 173 } | 173 } |
| 174 | 174 |
| 175 // static | 175 // static |
| 176 SkBitmap* CheckmarkThrobber::checkmark_ = NULL; | 176 SkBitmap* CheckmarkThrobber::checkmark_ = NULL; |
| 177 | 177 |
| 178 } // namespace views | 178 } // namespace views |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 8687031:
views: Move the remaining files to ui/views/controls/. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src