Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: ash/system/tray/tray_image_item.h

Issue 1540753002: Switch to standard integer types in ash/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: arraysize Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/system/tray/tray_event_filter.h ('k') | ash/system/tray/tray_item_more.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_IMAGE_ITEM_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
6 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
7 7
8 #include "ash/system/tray/system_tray_item.h" 8 #include "ash/system/tray/system_tray_item.h"
9 #include "base/macros.h"
9 10
10 namespace views { 11 namespace views {
11 class ImageView; 12 class ImageView;
12 } 13 }
13 14
14 namespace ash { 15 namespace ash {
15 class TrayItemView; 16 class TrayItemView;
16 17
17 class TrayImageItem : public SystemTrayItem { 18 class TrayImageItem : public SystemTrayItem {
18 public: 19 public:
(...skipping 24 matching lines...) Expand all
43 44
44 int resource_id_; 45 int resource_id_;
45 TrayItemView* tray_view_; 46 TrayItemView* tray_view_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(TrayImageItem); 48 DISALLOW_COPY_AND_ASSIGN(TrayImageItem);
48 }; 49 };
49 50
50 } // namespace ash 51 } // namespace ash
51 52
52 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 53 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_event_filter.h ('k') | ash/system/tray/tray_item_more.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698