Index: ui/views/mus/desktop_window_tree_host_mus.cc |
diff --git a/ui/views/mus/desktop_window_tree_host_mus.cc b/ui/views/mus/desktop_window_tree_host_mus.cc |
index c3097bd499666b4fe677a99dc499a001b7568652..383dc9bd81bcfbe181d97c7622ed1c3e692b8877 100644 |
--- a/ui/views/mus/desktop_window_tree_host_mus.cc |
+++ b/ui/views/mus/desktop_window_tree_host_mus.cc |
@@ -190,6 +190,10 @@ DesktopWindowTreeHostMus::DesktopWindowTreeHostMus( |
} |
DesktopWindowTreeHostMus::~DesktopWindowTreeHostMus() { |
+ // The cursor-client can be accessed during WindowTreeHostMus tear-down. So |
+ // the cursor client needs to be unset on the root-window before |
msw
2016/12/21 18:06:52
nit: be consistent with hyphen use (or not) for 'c
sadrul
2016/12/21 19:21:11
Done.
|
+ // |cursor_manager_| is destroyed. |
+ aura::client::SetCursorClient(window(), nullptr); |
MusClient::Get()->RemoveObserver(this); |
aura::Env::GetInstance()->RemoveObserver(this); |
desktop_native_widget_aura_->OnDesktopWindowTreeHostDestroyed(this); |