| Index: content/browser/renderer_host/render_widget_host_view_mac.h
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
|
| index b69a353afdccee3136108fba99ba19fe57a0f452..8b1f6e2c60dc1a5f2397e540da41f112dfbb644d 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
|
| @@ -38,7 +38,7 @@
|
| #import "ui/base/cocoa/command_dispatcher.h"
|
| #include "ui/base/cocoa/remote_layer_api.h"
|
| #import "ui/base/cocoa/tool_tip_base_view.h"
|
| -#include "ui/gfx/display_observer.h"
|
| +#include "ui/display/display_observer.h"
|
|
|
| namespace content {
|
| class RenderWidgetHostImpl;
|
| @@ -229,7 +229,7 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
|
| public DelegatedFrameHostClient,
|
| public ui::AcceleratedWidgetMacNSView,
|
| public IPC::Sender,
|
| - public gfx::DisplayObserver,
|
| + public display::DisplayObserver,
|
| public cc::BeginFrameObserverBase {
|
| public:
|
| // The view will associate itself with the given widget. The native view must
|
| @@ -356,10 +356,10 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
|
| // IPC::Sender implementation.
|
| bool Send(IPC::Message* message) override;
|
|
|
| - // gfx::DisplayObserver implementation.
|
| - void OnDisplayAdded(const gfx::Display& new_display) override;
|
| - void OnDisplayRemoved(const gfx::Display& old_display) override;
|
| - void OnDisplayMetricsChanged(const gfx::Display& display,
|
| + // display::DisplayObserver implementation.
|
| + 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;
|
|
|
| // Forwards the mouse event to the renderer.
|
|
|