| OLD | NEW |
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 ASH_SYSTEM_TRAY_THROBBER_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_THROBBER_VIEW_H_ |
| 6 #define ASH_SYSTEM_TRAY_THROBBER_VIEW_H_ | 6 #define ASH_SYSTEM_TRAY_THROBBER_VIEW_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" |
| 8 #include "ui/gfx/geometry/size.h" | 9 #include "ui/gfx/geometry/size.h" |
| 9 #include "ui/views/controls/throbber.h" | 10 #include "ui/views/controls/throbber.h" |
| 10 #include "ui/views/view.h" | 11 #include "ui/views/view.h" |
| 11 | 12 |
| 12 namespace ash { | 13 namespace ash { |
| 13 | 14 |
| 14 // A SmoothedThrobber with tooltip. | 15 // A SmoothedThrobber with tooltip. |
| 15 class SystemTrayThrobber : public views::SmoothedThrobber { | 16 class SystemTrayThrobber : public views::SmoothedThrobber { |
| 16 public: | 17 public: |
| 17 SystemTrayThrobber(); | 18 SystemTrayThrobber(); |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 | 55 |
| 55 // The current tooltip text. | 56 // The current tooltip text. |
| 56 base::string16 tooltip_text_; | 57 base::string16 tooltip_text_; |
| 57 | 58 |
| 58 DISALLOW_COPY_AND_ASSIGN(ThrobberView); | 59 DISALLOW_COPY_AND_ASSIGN(ThrobberView); |
| 59 }; | 60 }; |
| 60 | 61 |
| 61 } // namespace ash | 62 } // namespace ash |
| 62 | 63 |
| 63 #endif // ASH_SYSTEM_TRAY_THROBBER_VIEW_H_ | 64 #endif // ASH_SYSTEM_TRAY_THROBBER_VIEW_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1540753002:
Switch to standard integer types in ash/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master