| Index: content/browser/renderer_host/render_widget_host_view_aura.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| index cb330b8964dfe6b18165f85335fc69dbe8c45cb1..a67cd564f7c6a933e1682281496f0276452e5861 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
|
| @@ -38,8 +38,8 @@
|
| #include "ui/aura/window_tree_host_observer.h"
|
| #include "ui/base/ime/text_input_client.h"
|
| #include "ui/base/touch/selection_bound.h"
|
| +#include "ui/display/display_observer.h"
|
| #include "ui/events/gestures/motion_event_aura.h"
|
| -#include "ui/gfx/display_observer.h"
|
| #include "ui/gfx/geometry/insets.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/wm/public/activation_delegate.h"
|
| @@ -92,7 +92,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| : public RenderWidgetHostViewBase,
|
| public DelegatedFrameHostClient,
|
| public ui::TextInputClient,
|
| - public gfx::DisplayObserver,
|
| + public display::DisplayObserver,
|
| public aura::WindowTreeHostObserver,
|
| public aura::WindowDelegate,
|
| public aura::client::ActivationDelegate,
|
| @@ -236,10 +236,10 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
|
| bool IsEditCommandEnabled(int command_id) override;
|
| void SetEditCommandForNextKeyEvent(int command_id) 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 metrics) override;
|
|
|
| // Overridden from aura::WindowDelegate:
|
|
|