| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| index a2a36082571fec8a24ff03770f24db2b83eacf6a..c4b9f7168cc466df1f7b40cb346b44dc01a78a8c 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
|
| @@ -142,7 +142,7 @@ bool ShouldSendPinchGesture() {
|
| // RenderWidgetHostViewAura.
|
| class RenderWidgetHostViewAura::WindowObserver : public aura::WindowObserver {
|
| public:
|
| - WindowObserver(RenderWidgetHostViewAura* view) : view_(view) {}
|
| + explicit WindowObserver(RenderWidgetHostViewAura* view) : view_(view) {}
|
| virtual ~WindowObserver() {}
|
|
|
| // Overridden from aura::WindowObserver:
|
| @@ -156,8 +156,8 @@ class RenderWidgetHostViewAura::WindowObserver : public aura::WindowObserver {
|
| DISALLOW_COPY_AND_ASSIGN(WindowObserver);
|
| };
|
|
|
| -class RenderWidgetHostViewAura::ResizeLock :
|
| - public base::SupportsWeakPtr<RenderWidgetHostViewAura::ResizeLock> {
|
| +class RenderWidgetHostViewAura::ResizeLock
|
| + : public base::SupportsWeakPtr<RenderWidgetHostViewAura::ResizeLock> {
|
| public:
|
| ResizeLock(aura::RootWindow* root_window, const gfx::Size new_size)
|
| : root_window_(root_window),
|
| @@ -1168,6 +1168,13 @@ void RenderWidgetHostViewAura::OnWindowDestroyed() {
|
| void RenderWidgetHostViewAura::OnWindowVisibilityChanged(bool visible) {
|
| }
|
|
|
| +bool RenderWidgetHostViewAura::HasHitTestMask() const {
|
| + return false;
|
| +}
|
| +
|
| +void RenderWidgetHostViewAura::GetHitTestMask(gfx::Path* mask) const {
|
| +}
|
| +
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // RenderWidgetHostViewAura, aura::client::ActivationDelegate implementation:
|
|
|
|
|