| 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 #ifndef ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ |
| 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ | 6 #define ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ |
| 7 | 7 |
| 8 #include "ash/system/tray/actionable_view.h" | 8 #include "ash/system/tray/actionable_view.h" |
| 9 #include "base/macros.h" |
| 9 #include "ui/views/view.h" | 10 #include "ui/views/view.h" |
| 10 | 11 |
| 11 namespace views { | 12 namespace views { |
| 12 class ImageView; | 13 class ImageView; |
| 13 class Label; | 14 class Label; |
| 14 class View; | 15 class View; |
| 15 } | 16 } |
| 16 | 17 |
| 17 namespace ash { | 18 namespace ash { |
| 18 class SystemTrayItem; | 19 class SystemTrayItem; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 views::Label* label_; | 52 views::Label* label_; |
| 52 views::ImageView* more_; | 53 views::ImageView* more_; |
| 53 base::string16 accessible_name_; | 54 base::string16 accessible_name_; |
| 54 | 55 |
| 55 DISALLOW_COPY_AND_ASSIGN(TrayItemMore); | 56 DISALLOW_COPY_AND_ASSIGN(TrayItemMore); |
| 56 }; | 57 }; |
| 57 | 58 |
| 58 } // namespace ash | 59 } // namespace ash |
| 59 | 60 |
| 60 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_H_ | 61 #endif // ASH_SYSTEM_TRAY_TRAY_ITEM_MORE_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