| Index: chrome/browser/chromeos/login/ui/login_display_host_impl.h
|
| diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.h b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
|
| index 47b2185bf16c14adc5ddb8842495cedfb32c4709..4114523d118a1ed77662ef38cd4630ab713c26cc 100644
|
| --- a/chrome/browser/chromeos/login/ui/login_display_host_impl.h
|
| +++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.h
|
| @@ -29,7 +29,7 @@
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| -#include "ui/gfx/display_observer.h"
|
| +#include "ui/display/display_observer.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/keyboard/keyboard_controller_observer.h"
|
| #include "ui/views/widget/widget_removals_observer.h"
|
| @@ -60,7 +60,7 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
| public chromeos::CrasAudioHandler::AudioObserver,
|
| public ash::VirtualKeyboardStateObserver,
|
| public keyboard::KeyboardControllerObserver,
|
| - public gfx::DisplayObserver,
|
| + public display::DisplayObserver,
|
| public views::WidgetRemovalsObserver,
|
| public chrome::MultiUserWindowManager::Observer {
|
| public:
|
| @@ -130,10 +130,10 @@ class LoginDisplayHostImpl : public LoginDisplayHost,
|
| // Overridden from keyboard::KeyboardControllerObserver:
|
| void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
|
|
|
| - // Overridden from gfx::DisplayObserver:
|
| - void OnDisplayAdded(const gfx::Display& new_display) override;
|
| - void OnDisplayRemoved(const gfx::Display& old_display) override;
|
| - void OnDisplayMetricsChanged(const gfx::Display& display,
|
| + // Overridden from display::DisplayObserver:
|
| + void OnDisplayAdded(const display::Display& new_display) override;
|
| + void OnDisplayRemoved(const display::Display& old_display) override;
|
| + void OnDisplayMetricsChanged(const display::Display& display,
|
| uint32_t changed_metrics) override;
|
|
|
| // Overriden from views::WidgetRemovalsObserver:
|
|
|