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_SHELL_WINDOW_WATCHER_H_ | 5 #ifndef ASH_SHELL_WINDOW_WATCHER_H_ |
6 #define ASH_SHELL_WINDOW_WATCHER_H_ | 6 #define ASH_SHELL_WINDOW_WATCHER_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
| 11 #include <memory> |
11 | 12 |
12 #include "ash/shelf/shelf_item_types.h" | 13 #include "ash/shelf/shelf_item_types.h" |
13 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
14 #include "base/logging.h" | 15 #include "base/logging.h" |
15 #include "base/macros.h" | 16 #include "base/macros.h" |
16 #include "base/memory/scoped_ptr.h" | |
17 #include "ui/aura/window_observer.h" | 17 #include "ui/aura/window_observer.h" |
18 #include "ui/gfx/display_observer.h" | 18 #include "ui/gfx/display_observer.h" |
19 | 19 |
20 namespace aura { | 20 namespace aura { |
21 class Window; | 21 class Window; |
22 } | 22 } |
23 | 23 |
24 namespace ash { | 24 namespace ash { |
25 namespace shell { | 25 namespace shell { |
26 | 26 |
(...skipping 20 matching lines...) Expand all Loading... |
47 uint32_t metrics) override; | 47 uint32_t metrics) override; |
48 | 48 |
49 private: | 49 private: |
50 class WorkspaceWindowWatcher; | 50 class WorkspaceWindowWatcher; |
51 | 51 |
52 typedef std::map<ash::ShelfID, aura::Window*> IDToWindow; | 52 typedef std::map<ash::ShelfID, aura::Window*> IDToWindow; |
53 | 53 |
54 // Maps from window to the id we gave it. | 54 // Maps from window to the id we gave it. |
55 IDToWindow id_to_window_; | 55 IDToWindow id_to_window_; |
56 | 56 |
57 scoped_ptr<WorkspaceWindowWatcher> workspace_window_watcher_; | 57 std::unique_ptr<WorkspaceWindowWatcher> workspace_window_watcher_; |
58 | 58 |
59 DISALLOW_COPY_AND_ASSIGN(WindowWatcher); | 59 DISALLOW_COPY_AND_ASSIGN(WindowWatcher); |
60 }; | 60 }; |
61 | 61 |
62 } // namespace shell | 62 } // namespace shell |
63 } // namespace ash | 63 } // namespace ash |
64 | 64 |
65 #endif // ASH_SHELL_WINDOW_WATCHER_H_ | 65 #endif // ASH_SHELL_WINDOW_WATCHER_H_ |
OLD | NEW |