| 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 25bff5d36f57ca63f63dc1067b2c713d270c9604..98212e04f0accb299aac301399c2651c51d6cef4 100644
|
| --- a/ash/display/display_change_observer_chromeos.h
|
| +++ b/ash/display/display_change_observer_chromeos.h
|
| @@ -10,10 +10,10 @@
|
| #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"
|
| +#include "ui/display/manager/display_info.h"
|
| #include "ui/events/devices/input_device_event_observer.h"
|
|
|
| namespace ash {
|
| @@ -29,12 +29,12 @@ class DisplayChangeObserver : public ui::DisplayConfigurator::StateController,
|
| public ShellObserver {
|
| public:
|
| // Returns the mode list for internal display.
|
| - ASH_EXPORT static DisplayInfo::ManagedDisplayModeList
|
| - GetInternalManagedDisplayModeList(const DisplayInfo& display_info,
|
| + ASH_EXPORT static ui::DisplayInfo::ManagedDisplayModeList
|
| + GetInternalManagedDisplayModeList(const ui::DisplayInfo& display_info,
|
| const ui::DisplaySnapshot& output);
|
|
|
| // Returns the resolution list.
|
| - ASH_EXPORT static DisplayInfo::ManagedDisplayModeList
|
| + ASH_EXPORT static ui::DisplayInfo::ManagedDisplayModeList
|
| GetExternalManagedDisplayModeList(const ui::DisplaySnapshot& output);
|
|
|
| DisplayChangeObserver();
|
|
|