Chromium Code Reviews| Index: ash/display/display_change_observer_chromeos.h |
| diff --git a/ash/display/display_change_observer_chromeos.h b/ash/display/display_change_observer_chromeos.h |
| index 8d7e1d97866c7173f74c3e037fc75df9d6976de0..001c4d9862dd975d9ec055bd856c46dfa7c54e20 100644 |
| --- a/ash/display/display_change_observer_chromeos.h |
| +++ b/ash/display/display_change_observer_chromeos.h |
| @@ -10,6 +10,7 @@ |
| #include <vector> |
| #include "ash/ash_export.h" |
| +#include "ash/common/display/display_info.h" |
| #include "ash/common/shell_observer.h" |
| #include "base/macros.h" |
| #include "ui/display/chromeos/display_configurator.h" |
| @@ -18,7 +19,7 @@ |
| namespace ash { |
| class DisplayInfo; |
|
oshima
2016/08/02 19:44:57
nit: remove this?
rjkroege
2016/08/04 00:12:04
Done.
|
| -struct DisplayMode; |
| +class DisplayMode; |
| class DisplaySnapshot; |
| // An object that observes changes in display configuration and |
| @@ -29,12 +30,12 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController, |
| public ShellObserver { |
| public: |
| // Returns the mode list for internal display. |
| - ASH_EXPORT static std::vector<DisplayMode> GetInternalDisplayModeList( |
| + ASH_EXPORT static DisplayInfo::DisplayModeList GetInternalDisplayModeList( |
| const DisplayInfo& display_info, |
| const ui::DisplaySnapshot& output); |
| // Returns the resolution list. |
| - ASH_EXPORT static std::vector<DisplayMode> GetExternalDisplayModeList( |
| + ASH_EXPORT static DisplayInfo::DisplayModeList GetExternalDisplayModeList( |
| const ui::DisplaySnapshot& output); |
| DisplayChangeObserver(); |