ui/aura/window.cc - Issue 1539583003: Convert Pass()→std::move() in ui/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/aura/window.cc

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: ui/aura/window.cc

diff --git a/ui/aura/window.cc b/ui/aura/window.cc

index 2634eba17ef1182b2f87f76d3ac053273926a92f..8f27a6c92fce0665538d9303f06238c4c193aea0 100644

--- a/ui/aura/window.cc

+++ b/ui/aura/window.cc

@@ -5,6 +5,7 @@

#include "ui/aura/window.h"

#include <algorithm>

+#include <utility>

#include "base/bind.h"

#include "base/bind_helpers.h"

@@ -291,9 +292,9 @@ void Window::SetLayoutManager(LayoutManager* layout_manager) {

scoped_ptr<ui::EventTargeter>

Window::SetEventTargeter(scoped_ptr<ui::EventTargeter> targeter) {

- scoped_ptr<ui::EventTargeter> old_targeter = targeter_.Pass();

- targeter_ = targeter.Pass();

- return old_targeter.Pass();

+ scoped_ptr<ui::EventTargeter> old_targeter = std::move(targeter_);

+ targeter_ = std::move(targeter);

+ return old_targeter;

}

void Window::SetBounds(const gfx::Rect& new_bounds) {

« no previous file with comments | « ui/aura/test/env_test_helper.h ('k') | ui/aura/window_event_dispatcher_unittest.cc » ('j') | no next file with comments »