| Index: content/browser/renderer_host/render_widget_host_view_aura.cc
|
| ===================================================================
|
| --- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 114098)
|
| +++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy)
|
| @@ -100,7 +100,6 @@
|
| skip_schedule_paint_(false) {
|
| host_->SetView(this);
|
| window_->SetProperty(aura::kTooltipTextKey, &tooltip_);
|
| - aura::ActivationDelegate::SetActivationDelegate(window_, this);
|
| }
|
|
|
| RenderWidgetHostViewAura::~RenderWidgetHostViewAura() {
|
| @@ -543,6 +542,16 @@
|
| return popup_type_ == WebKit::WebPopupTypeNone;
|
| }
|
|
|
| +bool RenderWidgetHostViewAura::ShouldActivate(aura::Event* event) {
|
| + return false;
|
| +}
|
| +
|
| +void RenderWidgetHostViewAura::OnActivated() {
|
| +}
|
| +
|
| +void RenderWidgetHostViewAura::OnLostActive() {
|
| +}
|
| +
|
| void RenderWidgetHostViewAura::OnCaptureLost() {
|
| host_->LostCapture();
|
| }
|
| @@ -573,19 +582,6 @@
|
| void RenderWidgetHostViewAura::OnWindowVisibilityChanged(bool visible) {
|
| }
|
|
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -// RenderWidgetHostViewAura, aura::ActivationDelegate implementation:
|
| -
|
| -bool RenderWidgetHostViewAura::ShouldActivate(aura::Event* event) {
|
| - return false;
|
| -}
|
| -
|
| -void RenderWidgetHostViewAura::OnActivated() {
|
| -}
|
| -
|
| -void RenderWidgetHostViewAura::OnLostActive() {
|
| -}
|
| -
|
| #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // RenderWidgetHostViewAura, ui::CompositorDelegate implementation:
|
|
|