Chromium Code Reviews Chromium Code Reviews
Issue 1867223004:
Convert //ash from scoped_ptr to std::unique_ptr (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ | 5 #ifndef ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ |
| 6 #define ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ | 6 #define ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ |
| 7 | 7 |
| 8 #include <memory> | |
|
oshima
2016/04/08 07:09:42
remove this?
| |
| 9 | |
| 8 #include "ash/shell_window_ids.h" | 10 #include "ash/shell_window_ids.h" |
| 9 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 10 #include "base/macros.h" | 12 #include "base/macros.h" |
| 11 #include "base/memory/scoped_ptr.h" | |
| 12 #include "ui/aura/layout_manager.h" | 13 #include "ui/aura/layout_manager.h" |
| 13 | 14 |
| 14 namespace aura { | 15 namespace aura { |
| 15 class Window; | 16 class Window; |
| 16 } | 17 } |
| 17 namespace gfx { | 18 namespace gfx { |
| 18 class Rect; | 19 class Rect; |
| 19 } | 20 } |
| 20 namespace ui { | 21 namespace ui { |
| 21 class Layer; | 22 class Layer; |
| (...skipping 23 matching lines...) Expand all Loading... | |
| 45 | 46 |
| 46 private: | 47 private: |
| 47 aura::Window* owner_; | 48 aura::Window* owner_; |
| 48 | 49 |
| 49 DISALLOW_COPY_AND_ASSIGN(RootWindowLayoutManager); | 50 DISALLOW_COPY_AND_ASSIGN(RootWindowLayoutManager); |
| 50 }; | 51 }; |
| 51 | 52 |
| 52 } // namespace ash | 53 } // namespace ash |
| 53 | 54 |
| 54 #endif // ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ | 55 #endif // ASH_WM_ROOT_WINDOW_LAYOUT_MANAGER_H_ |
| OLD | NEW |
