| 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 74317b058fb5d16215b4d7505c94040d3ff978f6..8bacce0625ab35c5cc0d6c7fb80d6dfd4ddb6190 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.h
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.h
|
| @@ -17,10 +17,8 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
| -#include "content/browser/compositor/browser_compositor_ca_layer_tree_mac.h"
|
| #include "content/browser/compositor/browser_compositor_view_mac.h"
|
| #include "content/browser/compositor/delegated_frame_host.h"
|
| -#include "content/browser/compositor/io_surface_layer_mac.h"
|
| #include "content/browser/renderer_host/display_link_mac.h"
|
| #include "content/browser/renderer_host/render_widget_host_view_base.h"
|
| #include "content/browser/renderer_host/software_frame_manager.h"
|
| @@ -32,6 +30,8 @@
|
| #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
|
| #include "ui/base/cocoa/base_view.h"
|
| #include "ui/base/cocoa/remote_layer_api.h"
|
| +#include "ui/compositor/mac/accelerated_widget_mac.h"
|
| +#include "ui/compositor/mac/io_surface_layer_mac.h"
|
| #include "ui/gfx/display_observer.h"
|
|
|
| namespace content {
|
| @@ -205,7 +205,7 @@ class RenderWidgetHostImpl;
|
| class CONTENT_EXPORT RenderWidgetHostViewMac
|
| : public RenderWidgetHostViewBase,
|
| public DelegatedFrameHostClient,
|
| - public AcceleratedWidgetMacNSView,
|
| + public ui::AcceleratedWidgetMacNSView,
|
| public IPC::Sender,
|
| public gfx::DisplayObserver {
|
| public:
|
|
|