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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase Created 3 years, 9 months 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.cc ('k') | ash/system/tray/tray_image_item.cc » ('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_COMMON_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
6 #define ASH_COMMON_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/common/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "third_party/skia/include/core/SkColor.h" 11 #include "third_party/skia/include/core/SkColor.h"
12 12
13 namespace views { 13 namespace views {
14 class ImageView; 14 class ImageView;
15 } 15 }
16 16
17 namespace gfx { 17 namespace gfx {
18 struct VectorIcon; 18 struct VectorIcon;
19 } 19 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 SkColor icon_color_; 56 SkColor icon_color_;
57 57
58 // The image view in the tray. 58 // The image view in the tray.
59 TrayItemView* tray_view_; 59 TrayItemView* tray_view_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(TrayImageItem); 61 DISALLOW_COPY_AND_ASSIGN(TrayImageItem);
62 }; 62 };
63 63
64 } // namespace ash 64 } // namespace ash
65 65
66 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_ 66 #endif // ASH_SYSTEM_TRAY_TRAY_IMAGE_ITEM_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_event_filter.cc ('k') | ash/system/tray/tray_image_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698