Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: ash/display/mirror_window_controller.h

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/display/json_converter_unittest.cc ('k') | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_ 5 #ifndef ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_
6 #define ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_ 6 #define ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory>
11 #include <vector> 12 #include <vector>
12 13
13 #include "ash/ash_export.h" 14 #include "ash/ash_export.h"
14 #include "ash/display/display_manager.h" 15 #include "ash/display/display_manager.h"
15 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
16 #include "base/macros.h" 17 #include "base/macros.h"
17 #include "base/memory/ref_counted.h" 18 #include "base/memory/ref_counted.h"
18 #include "base/memory/scoped_ptr.h"
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 #include "ui/aura/window_tree_host_observer.h" 20 #include "ui/aura/window_tree_host_observer.h"
21 #include "ui/gfx/geometry/size.h" 21 #include "ui/gfx/geometry/size.h"
22 #include "ui/gfx/native_widget_types.h" 22 #include "ui/gfx/native_widget_types.h"
23 23
24 namespace aura { 24 namespace aura {
25 class Window; 25 class Window;
26 namespace client { 26 namespace client {
27 class ScreenPositionClient; 27 class ScreenPositionClient;
28 } 28 }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 void Close(bool delay_host_deletion); 91 void Close(bool delay_host_deletion);
92 92
93 void CloseAndDeleteHost(MirroringHostInfo* host_info, 93 void CloseAndDeleteHost(MirroringHostInfo* host_info,
94 bool delay_host_deletion); 94 bool delay_host_deletion);
95 95
96 typedef std::map<int64_t, MirroringHostInfo*> MirroringHostInfoMap; 96 typedef std::map<int64_t, MirroringHostInfo*> MirroringHostInfoMap;
97 MirroringHostInfoMap mirroring_host_info_map_; 97 MirroringHostInfoMap mirroring_host_info_map_;
98 98
99 DisplayManager::MultiDisplayMode multi_display_mode_; 99 DisplayManager::MultiDisplayMode multi_display_mode_;
100 100
101 scoped_ptr<aura::client::ScreenPositionClient> screen_position_client_; 101 std::unique_ptr<aura::client::ScreenPositionClient> screen_position_client_;
102 102
103 scoped_ptr<ui::Reflector> reflector_; 103 std::unique_ptr<ui::Reflector> reflector_;
104 104
105 DISALLOW_COPY_AND_ASSIGN(MirrorWindowController); 105 DISALLOW_COPY_AND_ASSIGN(MirrorWindowController);
106 }; 106 };
107 107
108 } // namespace ash 108 } // namespace ash
109 109
110 #endif // ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_ 110 #endif // ASH_DISPLAY_MIRROR_WINDOW_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/display/json_converter_unittest.cc ('k') | ash/display/mirror_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698