ash/common/display/display_info.h - Issue 2084533008: mash: Migrate tray audio and deps to common.

Side by Side Diff: ash/common/display/display_info.h

Issue 2084533008: mash: Migrate tray audio and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Cleanup IWYU. Created 4 years, 6 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

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_
	James Cook 2016/06/22 21:27:23 Can you file a bug about migrating / refactoring D Can you file a bug about migrating / refactoring DisplayManager? We're going to be a in weird state where some of //ash/display lives in //ash/common, I suspect for a long time. msw 2016/06/22 22:16:11 Done. http://crbug.com/622480 Show quoted text On 2016/06/22 21:27:23, James Cook wrote: > Can you file a bug about migrating / refactoring DisplayManager? We're going to > be a in weird state where some of //ash/display lives in //ash/common, I suspect > for a long time. Done. http://crbug.com/622480
6 #define ASH_DISPLAY_DISPLAY_INFO_H_	6 #define ASH_COMMON_DISPLAY_DISPLAY_INFO_H_
	James Cook 2016/06/22 21:27:23 Also, do you think it would make more sense to mov Also, do you think it would make more sense to move DisplayInfo to //ui/display? It has no //ash dependencies. I vaguely remember oshima talking about moving the display code around, but I'm not sure in which direction. msw 2016/06/22 21:33:32 I think that makes sense; +oshima for any thoughts Show quoted text On 2016/06/22 21:27:23, James Cook wrote: > Also, do you think it would make more sense to move DisplayInfo to //ui/display? > It has no //ash dependencies. I vaguely remember oshima talking about moving the > display code around, but I'm not sure in which direction. I think that makes sense; +oshima for any thoughts. oshima 2016/06/22 21:39:23 Yes, that (and moving a few other display classes) Show quoted text On 2016/06/22 21:33:32, msw wrote: > On 2016/06/22 21:27:23, James Cook wrote: > > Also, do you think it would make more sense to move DisplayInfo to > //ui/display? > > It has no //ash dependencies. I vaguely remember oshima talking about moving > the > > display code around, but I'm not sure in which direction. > > I think that makes sense; +oshima for any thoughts. Yes, that (and moving a few other display classes) is the plan, so you can move it now. msw 2016/06/22 22:16:11 Hmm, there's already a ui::DisplayMode class that Show quoted text On 2016/06/22 21:39:23, oshima wrote: > On 2016/06/22 21:33:32, msw wrote: > > On 2016/06/22 21:27:23, James Cook wrote: > > > Also, do you think it would make more sense to move DisplayInfo to > > //ui/display? > > > It has no //ash dependencies. I vaguely remember oshima talking about moving > > the > > > display code around, but I'm not sure in which direction. > > > > I think that makes sense; +oshima for any thoughts. > > Yes, that (and moving a few other display classes) is the plan, so you can move > it now. Hmm, there's already a ui::DisplayMode class that would conflict with moving the below ash::DisplayMode struct to the ui:: namespace. Using the display:: namespace wouldn't conflict, but the two objects should really be combined; and either action is outside the scope of this CL. I'll stick with the new ash/common/display location for now.
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

« no previous file with comments | « ash/aura/wm_shell_aura.cc ('k') | ash/common/display/display_info.cc » ('j') | ash/common/system/audio/volume_view.cc » ('J')