| 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_SYSTEM_TRAY_H_ | 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "ash/ash_export.h" | 12 #include "ash/ash_export.h" |
| 13 #include "ash/common/system/tray/system_tray_bubble.h" | 13 #include "ash/common/system/tray/system_tray_bubble.h" |
| 14 #include "ash/common/system/tray/tray_background_view.h" | 14 #include "ash/common/system/tray/tray_background_view.h" |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "base/memory/scoped_vector.h" | 16 #include "base/memory/scoped_vector.h" |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 | 254 |
| 255 // A reference to the Screen share and capture item. | 255 // A reference to the Screen share and capture item. |
| 256 ScreenTrayItem* screen_capture_tray_item_; // not owned | 256 ScreenTrayItem* screen_capture_tray_item_; // not owned |
| 257 ScreenTrayItem* screen_share_tray_item_; // not owned | 257 ScreenTrayItem* screen_share_tray_item_; // not owned |
| 258 | 258 |
| 259 DISALLOW_COPY_AND_ASSIGN(SystemTray); | 259 DISALLOW_COPY_AND_ASSIGN(SystemTray); |
| 260 }; | 260 }; |
| 261 | 261 |
| 262 } // namespace ash | 262 } // namespace ash |
| 263 | 263 |
| 264 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_H_ | 264 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_H_ |
| OLD | NEW |