| OLD | NEW | 
|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "mash/wm/root_window_controller.h" | 5 #include "mash/wm/root_window_controller.h" | 
| 6 | 6 | 
| 7 #include <stdint.h> | 7 #include <stdint.h> | 
| 8 | 8 | 
| 9 #include "base/bind.h" | 9 #include "base/bind.h" | 
| 10 #include "components/mus/common/util.h" | 10 #include "components/mus/common/util.h" | 
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 150 | 150 | 
| 151   app_->OnRootWindowControllerDoneInit(this); | 151   app_->OnRootWindowControllerDoneInit(this); | 
| 152 } | 152 } | 
| 153 | 153 | 
| 154 void RootWindowController::OnConnectionLost( | 154 void RootWindowController::OnConnectionLost( | 
| 155     mus::WindowTreeConnection* connection) { | 155     mus::WindowTreeConnection* connection) { | 
| 156   shadow_controller_.reset(); | 156   shadow_controller_.reset(); | 
| 157   delete this; | 157   delete this; | 
| 158 } | 158 } | 
| 159 | 159 | 
|  | 160 void RootWindowController::OnEventObserved(const ui::Event& event) { | 
|  | 161   // Does not use EventObservers. | 
|  | 162 } | 
|  | 163 | 
| 160 void RootWindowController::OnWindowDestroyed(mus::Window* window) { | 164 void RootWindowController::OnWindowDestroyed(mus::Window* window) { | 
| 161   DCHECK_EQ(window, root_); | 165   DCHECK_EQ(window, root_); | 
| 162   app_->OnRootWindowDestroyed(this); | 166   app_->OnRootWindowDestroyed(this); | 
| 163   root_->RemoveObserver(this); | 167   root_->RemoveObserver(this); | 
| 164   // Delete the |window_manager_| here so that WindowManager doesn't have to | 168   // Delete the |window_manager_| here so that WindowManager doesn't have to | 
| 165   // worry about the possibility of |root_| being null. | 169   // worry about the possibility of |root_| being null. | 
| 166   window_manager_.reset(); | 170   window_manager_.reset(); | 
| 167   root_ = nullptr; | 171   root_ = nullptr; | 
| 168 } | 172 } | 
| 169 | 173 | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 203   CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT); | 207   CreateContainer(mojom::Container::BUBBLES, mojom::Container::ROOT); | 
| 204   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS, | 208   CreateContainer(mojom::Container::SYSTEM_MODAL_WINDOWS, | 
| 205                   mojom::Container::ROOT); | 209                   mojom::Container::ROOT); | 
| 206   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT); | 210   CreateContainer(mojom::Container::KEYBOARD, mojom::Container::ROOT); | 
| 207   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT); | 211   CreateContainer(mojom::Container::MENUS, mojom::Container::ROOT); | 
| 208   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT); | 212   CreateContainer(mojom::Container::TOOLTIPS, mojom::Container::ROOT); | 
| 209 } | 213 } | 
| 210 | 214 | 
| 211 }  // namespace wm | 215 }  // namespace wm | 
| 212 }  // namespace mash | 216 }  // namespace mash | 
| OLD | NEW | 
|---|