Chromium Code Reviews| Index: ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| index 0bf8d127f9011ab5a987ce4fb21b721445646563..baa706edf4c70c01833bbaf41238db89c8529ed4 100644 |
| --- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| +++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc |
| @@ -410,7 +410,8 @@ void DesktopNativeWidgetAura::InitNativeWidget( |
| // Animations on TYPE_WINDOW are handled by the OS. Additionally if we animate |
| // these windows the size of the window gets augmented, effecting restore |
| // bounds and maximized windows in bad ways. |
| - if (params.type == Widget::InitParams::TYPE_WINDOW && |
| + if ((params.type == Widget::InitParams::TYPE_WINDOW || |
| + params.type == Widget::InitParams::TYPE_DRAG_BROWSER) && |
| !params.remove_standard_frame) { |
| content_window_->SetProperty(aura::client::kAnimationsDisabledKey, true); |
| } |
| @@ -438,7 +439,8 @@ void DesktopNativeWidgetAura::InitNativeWidget( |
| // The WindowsModalityController event filter should be at the head of the |
| // pre target handlers list. This ensures that it handles input events first |
| // when modal windows are at the top of the Zorder. |
| - if (widget_type_ == Widget::InitParams::TYPE_WINDOW) |
| + if ((widget_type_ == Widget::InitParams::TYPE_WINDOW || |
| + widget_type_ == Widget::InitParams::TYPE_DRAG_BROWSER)) |
|
Daniel Erat
2015/12/28 21:33:02
i don't think i understand this. why is a tab that
stapelberg
2016/01/18 17:22:23
I just did a search and replace for TYPE_WINDOW an
|
| window_modality_controller_.reset( |
| new wm::WindowModalityController(host_->window())); |
| @@ -522,7 +524,8 @@ void DesktopNativeWidgetAura::InitNativeWidget( |
| content_window_container_); |
| } |
| - if (params.type == Widget::InitParams::TYPE_WINDOW) { |
| + if (params.type == Widget::InitParams::TYPE_WINDOW || |
| + params.type == Widget::InitParams::TYPE_DRAG_BROWSER) { |
|
Daniel Erat
2015/12/28 21:33:02
same here. override-redirect windows typically don
stapelberg
2016/01/18 17:22:23
Done.
|
| focus_manager_event_handler_.reset(new FocusManagerEventHandler(this)); |
| host_->window()->AddPreTargetHandler(focus_manager_event_handler_.get()); |
| } |