Chromium Code Reviews| Index: content/browser/renderer_host/render_widget_host_view_aura.cc |
| =================================================================== |
| --- content/browser/renderer_host/render_widget_host_view_aura.cc (revision 113647) |
| +++ content/browser/renderer_host/render_widget_host_view_aura.cc (working copy) |
| @@ -100,6 +100,8 @@ |
| skip_schedule_paint_(false) { |
| host_->SetView(this); |
| window_->SetProperty(aura::kTooltipTextKey, &tooltip_); |
| + window_->SetProperty(aura::kActivationDelegateKey, |
|
sky
2011/12/09 23:11:23
It would be nice if you added a static setter for
|
| + static_cast<aura::ActivationDelegate*>(this)); |
| } |
| RenderWidgetHostViewAura::~RenderWidgetHostViewAura() { |
| @@ -535,16 +537,6 @@ |
| return popup_type_ == WebKit::WebPopupTypeNone; |
| } |
| -bool RenderWidgetHostViewAura::ShouldActivate(aura::Event* event) { |
| - return false; |
| -} |
| - |
| -void RenderWidgetHostViewAura::OnActivated() { |
| -} |
| - |
| -void RenderWidgetHostViewAura::OnLostActive() { |
| -} |
| - |
| void RenderWidgetHostViewAura::OnCaptureLost() { |
| host_->LostCapture(); |
| } |
| @@ -575,6 +567,19 @@ |
| 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: |