| Index: extensions/shell/browser/shell_desktop_controller_aura.cc
|
| diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc
|
| index 32983bb403272941dbf6b4185ca02b6b34c92cc2..ffa1383d68ce8a5ed0d0067ae62e5c5043fad19a 100644
|
| --- a/extensions/shell/browser/shell_desktop_controller_aura.cc
|
| +++ b/extensions/shell/browser/shell_desktop_controller_aura.cc
|
| @@ -236,7 +236,7 @@ void ShellDesktopControllerAura::PowerButtonEventReceived(
|
| }
|
|
|
| void ShellDesktopControllerAura::OnDisplayModeChanged(
|
| - const std::vector<ui::DisplayConfigurator::DisplayState>& displays) {
|
| + const ui::DisplayConfigurator::DisplayStateList& displays) {
|
| gfx::Size size = GetPrimaryDisplaySize();
|
| if (!size.IsEmpty())
|
| host_->UpdateRootWindowSize(size);
|
| @@ -343,11 +343,11 @@ void ShellDesktopControllerAura::DestroyRootWindow() {
|
|
|
| gfx::Size ShellDesktopControllerAura::GetPrimaryDisplaySize() {
|
| #if defined(OS_CHROMEOS)
|
| - const std::vector<ui::DisplayConfigurator::DisplayState>& displays =
|
| + const ui::DisplayConfigurator::DisplayStateList& displays =
|
| display_configurator_->cached_displays();
|
| if (displays.empty())
|
| return gfx::Size();
|
| - const ui::DisplayMode* mode = displays[0].display->current_mode();
|
| + const ui::DisplayMode* mode = displays[0]->current_mode();
|
| return mode ? mode->size() : gfx::Size();
|
| #else
|
| return gfx::Size();
|
|
|