| OLD | NEW |
|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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_DISPLAY_DISPLAY_INFO_H_ | 5 #ifndef ASH_COMMON_DISPLAY_DISPLAY_INFO_H_ |
| 6 #define ASH_DISPLAY_DISPLAY_INFO_H_ | 6 #define ASH_COMMON_DISPLAY_DISPLAY_INFO_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| 11 #include <string> | 11 #include <string> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "ash/ash_export.h" | 14 #include "ash/ash_export.h" |
| 15 #include "base/files/file_path.h" | 15 #include "base/files/file_path.h" |
| 16 #include "ui/display/display.h" | 16 #include "ui/display/display.h" |
| (...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 330 | 330 |
| 331 // If you add a new member, you need to update Copy(). | 331 // If you add a new member, you need to update Copy(). |
| 332 }; | 332 }; |
| 333 | 333 |
| 334 // Resets the synthesized display id for testing. This | 334 // Resets the synthesized display id for testing. This |
| 335 // is necessary to avoid overflowing the output index. | 335 // is necessary to avoid overflowing the output index. |
| 336 ASH_EXPORT void ResetDisplayIdForTest(); | 336 ASH_EXPORT void ResetDisplayIdForTest(); |
| 337 | 337 |
| 338 } // namespace ash | 338 } // namespace ash |
| 339 | 339 |
| 340 #endif // ASH_DISPLAY_DISPLAY_INFO_H_ | 340 #endif // ASH_COMMON_DISPLAY_DISPLAY_INFO_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2084533008:
mash: Migrate tray audio and deps to common. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master