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

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

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
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 #include "ash/display/mirror_window_controller.h" 5 #include "ash/display/mirror_window_controller.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #if defined(USE_X11) 9 #if defined(USE_X11)
10 #include <X11/Xlib.h> 10 #include <X11/Xlib.h>
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 ? DisplayManager::UNIFIED 131 ? DisplayManager::UNIFIED
132 : (display_manager->IsInMirrorMode() ? DisplayManager::MIRRORING 132 : (display_manager->IsInMirrorMode() ? DisplayManager::MIRRORING
133 : DisplayManager::EXTENDED); 133 : DisplayManager::EXTENDED);
134 } 134 }
135 135
136 } // namespace 136 } // namespace
137 137
138 struct MirrorWindowController::MirroringHostInfo { 138 struct MirrorWindowController::MirroringHostInfo {
139 MirroringHostInfo(); 139 MirroringHostInfo();
140 ~MirroringHostInfo(); 140 ~MirroringHostInfo();
141 scoped_ptr<AshWindowTreeHost> ash_host; 141 std::unique_ptr<AshWindowTreeHost> ash_host;
142 gfx::Size mirror_window_host_size; 142 gfx::Size mirror_window_host_size;
143 aura::Window* mirror_window = nullptr; 143 aura::Window* mirror_window = nullptr;
144 }; 144 };
145 145
146 MirrorWindowController::MirroringHostInfo::MirroringHostInfo() { 146 MirrorWindowController::MirroringHostInfo::MirroringHostInfo() {
147 } 147 }
148 MirrorWindowController::MirroringHostInfo::~MirroringHostInfo() { 148 MirrorWindowController::MirroringHostInfo::~MirroringHostInfo() {
149 } 149 }
150 150
151 MirrorWindowController::MirrorWindowController() 151 MirrorWindowController::MirrorWindowController()
(...skipping 10 matching lines...) Expand all
162 const std::vector<DisplayInfo>& display_info_list) { 162 const std::vector<DisplayInfo>& display_info_list) {
163 static int mirror_host_count = 0; 163 static int mirror_host_count = 0;
164 DisplayManager* display_manager = Shell::GetInstance()->display_manager(); 164 DisplayManager* display_manager = Shell::GetInstance()->display_manager();
165 const gfx::Display& primary = gfx::Screen::GetScreen()->GetPrimaryDisplay(); 165 const gfx::Display& primary = gfx::Screen::GetScreen()->GetPrimaryDisplay();
166 const DisplayInfo& source_display_info = 166 const DisplayInfo& source_display_info =
167 display_manager->GetDisplayInfo(primary.id()); 167 display_manager->GetDisplayInfo(primary.id());
168 168
169 multi_display_mode_ = GetCurrentMultiDisplayMode(); 169 multi_display_mode_ = GetCurrentMultiDisplayMode();
170 170
171 for (const DisplayInfo& display_info : display_info_list) { 171 for (const DisplayInfo& display_info : display_info_list) {
172 scoped_ptr<RootWindowTransformer> transformer; 172 std::unique_ptr<RootWindowTransformer> transformer;
173 if (display_manager->IsInMirrorMode()) { 173 if (display_manager->IsInMirrorMode()) {
174 transformer.reset(CreateRootWindowTransformerForMirroredDisplay( 174 transformer.reset(CreateRootWindowTransformerForMirroredDisplay(
175 source_display_info, display_info)); 175 source_display_info, display_info));
176 } else if (display_manager->IsInUnifiedMode()) { 176 } else if (display_manager->IsInUnifiedMode()) {
177 gfx::Display display = 177 gfx::Display display =
178 display_manager->GetMirroringDisplayById(display_info.id()); 178 display_manager->GetMirroringDisplayById(display_info.id());
179 transformer.reset(CreateRootWindowTransformerForUnifiedDesktop( 179 transformer.reset(CreateRootWindowTransformerForUnifiedDesktop(
180 primary.bounds(), display)); 180 primary.bounds(), display));
181 } else { 181 } else {
182 NOTREACHED(); 182 NOTREACHED();
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 // EventProcessor may be accessed after this call if the mirroring window 380 // EventProcessor may be accessed after this call if the mirroring window
381 // was deleted as a result of input event (e.g. shortcut), so don't delete 381 // was deleted as a result of input event (e.g. shortcut), so don't delete
382 // now. 382 // now.
383 if (delay_host_deletion) 383 if (delay_host_deletion)
384 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_info); 384 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, host_info);
385 else 385 else
386 delete host_info; 386 delete host_info;
387 } 387 }
388 388
389 } // namespace ash 389 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/mirror_window_controller.h ('k') | ash/display/mirror_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698