Index: ui/views/view.cc |
diff --git a/ui/views/view.cc b/ui/views/view.cc |
index d2bc11e698e8fb6ece727bc2541fdeca978d41ba..e085544e1a524354f2a09cfd51a9e5e5b6ac5266 100644 |
--- a/ui/views/view.cc |
+++ b/ui/views/view.cc |
@@ -8,6 +8,7 @@ |
#include <algorithm> |
#include <cmath> |
+#include <utility> |
#include "base/logging.h" |
#include "base/memory/scoped_ptr.h" |
@@ -475,7 +476,7 @@ scoped_ptr<ui::Layer> View::RecreateLayer() { |
Widget* widget = GetWidget(); |
if (widget) |
widget->UpdateRootLayers(); |
- return old_layer.Pass(); |
+ return old_layer; |
} |
// RTL positioning ------------------------------------------------------------- |
@@ -848,7 +849,9 @@ void View::set_background(Background* b) { |
background_.reset(b); |
} |
-void View::SetBorder(scoped_ptr<Border> b) { border_ = b.Pass(); } |
+void View::SetBorder(scoped_ptr<Border> b) { |
+ border_ = std::move(b); |
+} |
const ui::ThemeProvider* View::GetThemeProvider() const { |
const Widget* widget = GetWidget(); |
@@ -1057,9 +1060,9 @@ const ui::InputMethod* View::GetInputMethod() const { |
scoped_ptr<ViewTargeter> |
View::SetEventTargeter(scoped_ptr<ViewTargeter> targeter) { |
- scoped_ptr<ViewTargeter> old_targeter = targeter_.Pass(); |
- targeter_ = targeter.Pass(); |
- return old_targeter.Pass(); |
+ scoped_ptr<ViewTargeter> old_targeter = std::move(targeter_); |
+ targeter_ = std::move(targeter); |
+ return old_targeter; |
} |
ViewTargeter* View::GetEffectiveViewTargeter() const { |