Index: ui/views/widget/native_widget_aura.cc |
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc |
index 341355c9f972f4608a94e9bd1a0b24fe367d2611..2739708ab6fa8470d4f41524c608f5a3ddbfe9ec 100644 |
--- a/ui/views/widget/native_widget_aura.cc |
+++ b/ui/views/widget/native_widget_aura.cc |
@@ -765,7 +765,7 @@ void NativeWidgetAura::OnWindowVisibilityChanged(bool visible) { |
// NativeWidgetAura, aura::ActivationDelegate implementation: |
bool NativeWidgetAura::ShouldActivate(aura::Event* event) { |
- return can_activate_; |
+ return can_activate_ && delegate_->CanActivate(); |
Ben Goodger (Google)
2012/02/16 02:57:43
I don't think this can work... did you test this?
|
} |
void NativeWidgetAura::OnActivated() { |