Chromium Code Reviews| Index: components/constrained_window/native_web_contents_modal_dialog_manager_views.cc |
| diff --git a/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc b/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc |
| index dca66733a35f971af93be521c6980d0579b9f966..64e28a62a30ef8e4fb2c5624c36299d15a84c115 100644 |
| --- a/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc |
| +++ b/components/constrained_window/native_web_contents_modal_dialog_manager_views.cc |
| @@ -20,6 +20,7 @@ |
| #if defined(USE_AURA) |
| #include "ui/aura/client/aura_constants.h" |
| #include "ui/aura/window.h" |
| +#include "ui/aura/window_targeter.h" |
| #include "ui/wm/core/visibility_controller.h" |
| #include "ui/wm/core/window_animations.h" |
| #include "ui/wm/core/window_modality_controller.h" |
| @@ -35,12 +36,13 @@ namespace constrained_window { |
| NativeWebContentsModalDialogManagerViews:: |
| NativeWebContentsModalDialogManagerViews( |
| gfx::NativeWindow dialog, |
| - SingleWebContentsDialogManagerDelegate* native_delegate) |
| + SingleWebContentsDialogManagerDelegate* native_delegate, |
| + bool is_nonclipped) |
| : native_delegate_(native_delegate), |
| dialog_(dialog), |
| host_(NULL), |
| host_destroying_(false) { |
| - ManageDialog(); |
| + ManageDialog(is_nonclipped); |
| } |
| NativeWebContentsModalDialogManagerViews:: |
| @@ -54,7 +56,8 @@ NativeWebContentsModalDialogManagerViews:: |
| } |
| } |
| -void NativeWebContentsModalDialogManagerViews::ManageDialog() { |
| +void NativeWebContentsModalDialogManagerViews:: |
| + ManageDialog(bool is_nonclipped) { |
|
Mike Wittman
2016/08/19 19:46:57
nit: line break after open paren rather than befor
rbpotter
2016/08/19 21:43:38
Done.
|
| views::Widget* widget = GetWidget(dialog()); |
| widget->AddObserver(this); |
| observed_widgets_.insert(widget); |
| @@ -78,7 +81,13 @@ void NativeWebContentsModalDialogManagerViews::ManageDialog() { |
| wm::SetModalParent(widget->GetNativeWindow(), |
| native_delegate_->GetWebContents()->GetNativeView()); |
| -#endif |
| +#if defined(OS_CHROMEOS) |
| + if (is_nonclipped) { |
| + widget->SetNativeWindowProperty(aura::kHasIndependentBoundsKey, |
| + reinterpret_cast<void*>(true)); |
| + } |
| +#endif // defined(OS_CHROMEOS) |
| +#endif // defined(USE_AURA) |
| } |
| // SingleWebContentsDialogManager: |