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

Unified Diff: content/renderer/mus/compositor_mus_connection.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/mus/compositor_mus_connection.cc
diff --git a/content/renderer/mus/compositor_mus_connection.cc b/content/renderer/mus/compositor_mus_connection.cc
index d303789626b6e8ba5d576d0373de336fb119dabc..57cdb76d79c0e1a21d7ea76c436b35fdaf476b2b 100644
--- a/content/renderer/mus/compositor_mus_connection.cc
+++ b/content/renderer/mus/compositor_mus_connection.cc
@@ -39,7 +39,7 @@ CompositorMusConnection::CompositorMusConnection(
}
void CompositorMusConnection::AttachSurfaceOnMainThread(
- scoped_ptr<mus::WindowSurfaceBinding> surface_binding) {
+ std::unique_ptr<mus::WindowSurfaceBinding> surface_binding) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
compositor_task_runner_->PostTask(
FROM_HERE,
@@ -50,7 +50,7 @@ void CompositorMusConnection::AttachSurfaceOnMainThread(
CompositorMusConnection::~CompositorMusConnection() {}
void CompositorMusConnection::AttachSurfaceOnCompositorThread(
- scoped_ptr<mus::WindowSurfaceBinding> surface_binding) {
+ std::unique_ptr<mus::WindowSurfaceBinding> surface_binding) {
DCHECK(compositor_task_runner_->BelongsToCurrentThread());
window_surface_binding_ = std::move(surface_binding);
if (root_) {
@@ -77,7 +77,7 @@ void CompositorMusConnection::OnConnectionLostOnMainThread() {
}
void CompositorMusConnection::OnWindowInputEventOnMainThread(
- scoped_ptr<blink::WebInputEvent> web_event,
+ std::unique_ptr<blink::WebInputEvent> web_event,
const base::Callback<void(bool)>& ack) {
DCHECK(main_task_runner_->BelongsToCurrentThread());
RenderWidgetMusConnection* connection =
@@ -117,11 +117,12 @@ void CompositorMusConnection::OnEmbed(mus::Window* root) {
void CompositorMusConnection::OnWindowInputEvent(
mus::Window* window,
const ui::Event& event,
- scoped_ptr<base::Callback<void(bool)>>* ack_callback) {
+ std::unique_ptr<base::Callback<void(bool)>>* ack_callback) {
DCHECK(compositor_task_runner_->BelongsToCurrentThread());
// TODO(moshayedi): Convert ui::Event directly to blink::WebInputEvent.
- scoped_ptr<blink::WebInputEvent> web_event(
- mus::mojom::Event::From(event).To<scoped_ptr<blink::WebInputEvent>>());
+ std::unique_ptr<blink::WebInputEvent> web_event(
+ mus::mojom::Event::From(event)
+ .To<std::unique_ptr<blink::WebInputEvent>>());
// TODO(sad): We probably need to plumb LatencyInfo through Mus.
ui::LatencyInfo info;
InputEventAckState ack_state = input_handler_manager_->HandleInputEvent(
« no previous file with comments | « content/renderer/mus/compositor_mus_connection.h ('k') | content/renderer/mus/compositor_mus_connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698