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

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 1547223002: Convert Pass()→std::move() in //ash (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 19d53e198ccdd5cc4c77544405cb9fa42c6f90c3..25fde9c36bfe09aa2b58c0fb5bcdbf70dc8a99f6 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <cmath>
#include <string>
+#include <utility>
#include "ash/accelerators/accelerator_commands.h"
#include "ash/accelerators/debug_commands.h"
@@ -169,7 +170,8 @@ void ShowDeprecatedAcceleratorNotification(const char* const notification_id,
system_notifier::kNotifierDeprecatedAccelerator),
message_center::RichNotificationData(),
new DeprecatedAcceleratorNotificationDelegate));
- message_center::MessageCenter::Get()->AddNotification(notification.Pass());
+ message_center::MessageCenter::Get()->AddNotification(
+ std::move(notification));
}
void RecordUmaHistogram(const char* histogram_name,
@@ -831,17 +833,17 @@ AcceleratorController::GetCurrentAcceleratorRestriction() {
void AcceleratorController::SetBrightnessControlDelegate(
scoped_ptr<BrightnessControlDelegate> brightness_control_delegate) {
- brightness_control_delegate_ = brightness_control_delegate.Pass();
+ brightness_control_delegate_ = std::move(brightness_control_delegate);
}
void AcceleratorController::SetImeControlDelegate(
scoped_ptr<ImeControlDelegate> ime_control_delegate) {
- ime_control_delegate_ = ime_control_delegate.Pass();
+ ime_control_delegate_ = std::move(ime_control_delegate);
}
void AcceleratorController::SetScreenshotDelegate(
scoped_ptr<ScreenshotDelegate> screenshot_delegate) {
- screenshot_delegate_ = screenshot_delegate.Pass();
+ screenshot_delegate_ = std::move(screenshot_delegate);
}
bool AcceleratorController::ShouldCloseMenuAndRepostAccelerator(
@@ -1454,7 +1456,7 @@ void AcceleratorController::SetKeyboardBrightnessControlDelegate(
scoped_ptr<KeyboardBrightnessControlDelegate>
keyboard_brightness_control_delegate) {
keyboard_brightness_control_delegate_ =
- keyboard_brightness_control_delegate.Pass();
+ std::move(keyboard_brightness_control_delegate);
}
} // namespace ash
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698