| Index: ui/views/corewm/wm_state.cc
|
| diff --git a/ui/views/corewm/wm_state.cc b/ui/views/corewm/wm_state.cc
|
| index 07992479d64cfa8521b269a29dc04332d6aaa250..16d9e7ac9998fb8e2c6d1c301dbfe3cca4cc7528 100644
|
| --- a/ui/views/corewm/wm_state.cc
|
| +++ b/ui/views/corewm/wm_state.cc
|
| @@ -4,19 +4,27 @@
|
|
|
| #include "ui/views/corewm/wm_state.h"
|
|
|
| +#include "ui/views/corewm/transient_window_controller.h"
|
| #include "ui/views/corewm/transient_window_stacking_client.h"
|
|
|
| namespace views {
|
| namespace corewm {
|
|
|
| WMState::WMState()
|
| - : window_stacking_client_(new TransientWindowStackingClient) {
|
| + : window_stacking_client_(new TransientWindowStackingClient),
|
| + transient_window_client_(new TransientWindowController) {
|
| aura::client::SetWindowStackingClient(window_stacking_client_.get());
|
| + aura::client::SetTransientWindowClient(transient_window_client_.get());
|
| }
|
|
|
| WMState::~WMState() {
|
| if (aura::client::GetWindowStackingClient() == window_stacking_client_.get())
|
| aura::client::SetWindowStackingClient(NULL);
|
| +
|
| + if (aura::client::GetTransientWindowClient() ==
|
| + transient_window_client_.get()) {
|
| + aura::client::SetTransientWindowClient(NULL);
|
| + }
|
| }
|
|
|
| } // namespace corewm
|
|
|