| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ash/mus/window_manager.h" | 5 #include "ash/mus/window_manager.h" | 
| 6 | 6 | 
| 7 #include <stdint.h> | 7 #include <stdint.h> | 
| 8 | 8 | 
| 9 #include <utility> | 9 #include <utility> | 
| 10 | 10 | 
| (...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 335                  ->GetRootWindowController()) | 335                  ->GetRootWindowController()) | 
| 336       ->root_window_controller(); | 336       ->root_window_controller(); | 
| 337 } | 337 } | 
| 338 | 338 | 
| 339 void WindowManager::OnEmbed( | 339 void WindowManager::OnEmbed( | 
| 340     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) { | 340     std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) { | 
| 341   // WindowManager should never see this, instead OnWmNewDisplay() is called. | 341   // WindowManager should never see this, instead OnWmNewDisplay() is called. | 
| 342   NOTREACHED(); | 342   NOTREACHED(); | 
| 343 } | 343 } | 
| 344 | 344 | 
| 345 void WindowManager::OnEmbedRootDestroyed(aura::Window* root) { | 345 void WindowManager::OnEmbedRootDestroyed( | 
|  | 346     aura::WindowTreeHostMus* window_tree_host) { | 
| 346   // WindowManager should never see this. | 347   // WindowManager should never see this. | 
| 347   NOTREACHED(); | 348   NOTREACHED(); | 
| 348 } | 349 } | 
| 349 | 350 | 
| 350 void WindowManager::OnLostConnection(aura::WindowTreeClient* client) { | 351 void WindowManager::OnLostConnection(aura::WindowTreeClient* client) { | 
| 351   DCHECK_EQ(client, window_tree_client_.get()); | 352   DCHECK_EQ(client, window_tree_client_.get()); | 
| 352   Shutdown(); | 353   Shutdown(); | 
| 353   // TODO(sky): this case should trigger shutting down WindowManagerApplication | 354   // TODO(sky): this case should trigger shutting down WindowManagerApplication | 
| 354   // too. | 355   // too. | 
| 355 } | 356 } | 
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 511 | 512 | 
| 512 void WindowManager::OnWindowInitialized(aura::Window* window) { | 513 void WindowManager::OnWindowInitialized(aura::Window* window) { | 
| 513   // This ensures WmWindowAura won't be called before WmWindowMus. This is | 514   // This ensures WmWindowAura won't be called before WmWindowMus. This is | 
| 514   // important as if WmWindowAura::Get() is called first, then WmWindowAura | 515   // important as if WmWindowAura::Get() is called first, then WmWindowAura | 
| 515   // would be created, not WmWindowMus. | 516   // would be created, not WmWindowMus. | 
| 516   WmWindowMus::Get(window); | 517   WmWindowMus::Get(window); | 
| 517 } | 518 } | 
| 518 | 519 | 
| 519 }  // namespace mus | 520 }  // namespace mus | 
| 520 }  // namespace ash | 521 }  // namespace ash | 
| OLD | NEW | 
|---|