| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/scoped_root_window_for_new_windows.h" | 5 #include "ash/scoped_root_window_for_new_windows.h" |
| 6 | 6 |
| 7 #include "ash/shell.h" | 7 #include "ash/shell.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| 11 | 11 |
| 12 ScopedRootWindowForNewWindows::ScopedRootWindowForNewWindows( | 12 ScopedRootWindowForNewWindows::ScopedRootWindowForNewWindows( |
| 13 WmWindow* new_root) { | 13 aura::Window* new_root) { |
| 14 DCHECK(new_root); | 14 DCHECK(new_root); |
| 15 Shell::Get()->scoped_root_window_for_new_windows_ = new_root; | 15 Shell::Get()->scoped_root_window_for_new_windows_ = new_root; |
| 16 } | 16 } |
| 17 | 17 |
| 18 ScopedRootWindowForNewWindows::~ScopedRootWindowForNewWindows() { | 18 ScopedRootWindowForNewWindows::~ScopedRootWindowForNewWindows() { |
| 19 Shell::Get()->scoped_root_window_for_new_windows_ = nullptr; | 19 Shell::Get()->scoped_root_window_for_new_windows_ = nullptr; |
| 20 } | 20 } |
| 21 | 21 |
| 22 } // namespace ash | 22 } // namespace ash |
| OLD | NEW |