| 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_CHROMEOS_TRAY_DISPLAY_H_ | 5 #ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| 6 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ | 6 #define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 | 11 |
| 12 #include "ash/ash_export.h" | 12 #include "ash/ash_export.h" |
| 13 #include "ash/common/display/display_info.h" |
| 13 #include "ash/common/system/tray/system_tray_item.h" | 14 #include "ash/common/system/tray/system_tray_item.h" |
| 14 #include "ash/display/display_info.h" | |
| 15 #include "ash/display/window_tree_host_manager.h" | 15 #include "ash/display/window_tree_host_manager.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| 17 #include "base/strings/string16.h" | 17 #include "base/strings/string16.h" |
| 18 #include "ui/views/view.h" | 18 #include "ui/views/view.h" |
| 19 | 19 |
| 20 namespace ash { | 20 namespace ash { |
| 21 class DisplayView; | 21 class DisplayView; |
| 22 | 22 |
| 23 namespace test { | 23 namespace test { |
| 24 class AshTestBase; | 24 class AshTestBase; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 DisplayView* default_; | 73 DisplayView* default_; |
| 74 DisplayInfoMap display_info_; | 74 DisplayInfoMap display_info_; |
| 75 | 75 |
| 76 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); | 76 DISALLOW_COPY_AND_ASSIGN(TrayDisplay); |
| 77 }; | 77 }; |
| 78 | 78 |
| 79 } // namespace ash | 79 } // namespace ash |
| 80 | 80 |
| 81 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ | 81 #endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_ |
| OLD | NEW |