| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index aec2c9d94ca9f0fc95639243c5a47f0bb44ad853..6ac85d4cc989838300835eb34d477dcb0c80e933 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -836,22 +836,7 @@ void RootWindowController::OnTouchHudProjectionToggled(bool enabled) {
|
| }
|
|
|
| RootWindowController* GetRootWindowController(const aura::Window* root_window) {
|
| - if (!root_window)
|
| - return nullptr;
|
| -
|
| - if (Shell::GetInstance()->in_mus()) {
|
| - // On mus, like desktop aura, each top-level widget has its own root window,
|
| - // so |root_window| is not necessarily the display's root. For now, just
|
| - // the use the primary display root.
|
| - // TODO(jamescook): Multi-display support. This depends on how mus windows
|
| - // will be owned by displays.
|
| - aura::Window* primary_root_window = Shell::GetInstance()
|
| - ->window_tree_host_manager()
|
| - ->GetPrimaryRootWindow();
|
| - return GetRootWindowSettings(primary_root_window)->controller;
|
| - }
|
| -
|
| - return GetRootWindowSettings(root_window)->controller;
|
| + return root_window ? GetRootWindowSettings(root_window)->controller : nullptr;
|
| }
|
|
|
| } // namespace ash
|
|
|