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

Side by Side Diff: ui/aura/window_tree_host_platform.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/aura/window_tree_host_platform.h ('k') | ui/aura/window_tree_host_x11.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "ui/aura/window_tree_host_platform.h" 5 #include "ui/aura/window_tree_host_platform.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #endif 50 #endif
51 } 51 }
52 52
53 WindowTreeHostPlatform::WindowTreeHostPlatform() 53 WindowTreeHostPlatform::WindowTreeHostPlatform()
54 : widget_(gfx::kNullAcceleratedWidget), 54 : widget_(gfx::kNullAcceleratedWidget),
55 current_cursor_(ui::kCursorNull) { 55 current_cursor_(ui::kCursorNull) {
56 CreateCompositor(); 56 CreateCompositor();
57 } 57 }
58 58
59 void WindowTreeHostPlatform::SetPlatformWindow( 59 void WindowTreeHostPlatform::SetPlatformWindow(
60 scoped_ptr<ui::PlatformWindow> window) { 60 std::unique_ptr<ui::PlatformWindow> window) {
61 window_ = std::move(window); 61 window_ = std::move(window);
62 } 62 }
63 63
64 WindowTreeHostPlatform::~WindowTreeHostPlatform() { 64 WindowTreeHostPlatform::~WindowTreeHostPlatform() {
65 DestroyCompositor(); 65 DestroyCompositor();
66 DestroyDispatcher(); 66 DestroyDispatcher();
67 } 67 }
68 68
69 ui::EventSource* WindowTreeHostPlatform::GetEventSource() { 69 ui::EventSource* WindowTreeHostPlatform::GetEventSource() {
70 return this; 70 return this;
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 DCHECK_EQ(widget, widget_); 179 DCHECK_EQ(widget, widget_);
180 widget_ = gfx::kNullAcceleratedWidget; 180 widget_ = gfx::kNullAcceleratedWidget;
181 } 181 }
182 182
183 void WindowTreeHostPlatform::OnActivationChanged(bool active) { 183 void WindowTreeHostPlatform::OnActivationChanged(bool active) {
184 if (active) 184 if (active)
185 OnHostActivated(); 185 OnHostActivated();
186 } 186 }
187 187
188 } // namespace aura 188 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/window_tree_host_platform.h ('k') | ui/aura/window_tree_host_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698