| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "athena/wm/window_manager_impl.h" | 5 #include "athena/wm/window_manager_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "athena/screen/public/screen_manager.h" | 9 #include "athena/screen/public/screen_manager.h" |
| 10 #include "athena/util/container_priorities.h" | 10 #include "athena/util/container_priorities.h" |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 } | 419 } |
| 420 | 420 |
| 421 // static | 421 // static |
| 422 void WindowManager::Shutdown() { | 422 void WindowManager::Shutdown() { |
| 423 DCHECK(instance); | 423 DCHECK(instance); |
| 424 delete instance; | 424 delete instance; |
| 425 DCHECK(!instance); | 425 DCHECK(!instance); |
| 426 } | 426 } |
| 427 | 427 |
| 428 // static | 428 // static |
| 429 WindowManager* WindowManager::GetInstance() { | 429 WindowManager* WindowManager::Get() { |
| 430 DCHECK(instance); | 430 DCHECK(instance); |
| 431 return instance; | 431 return instance; |
| 432 } | 432 } |
| 433 | 433 |
| 434 } // namespace athena | 434 } // namespace athena |
| OLD | NEW |