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

Unified Diff: ash/sticky_keys/sticky_keys_controller.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments 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
« no previous file with comments | « ash/sticky_keys/sticky_keys_controller.h ('k') | ash/sticky_keys/sticky_keys_overlay.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sticky_keys/sticky_keys_controller.cc
diff --git a/ash/sticky_keys/sticky_keys_controller.cc b/ash/sticky_keys/sticky_keys_controller.cc
index 0453d9672d256ec0fc00bf03e64fcd8f551f6773..4f31709c34cd672ba140705713fc887071e13cae 100644
--- a/ash/sticky_keys/sticky_keys_controller.cc
+++ b/ash/sticky_keys/sticky_keys_controller.cc
@@ -172,7 +172,7 @@ ui::EventRewriteStatus StickyKeysController::RewriteScrollEvent(
}
ui::EventRewriteStatus StickyKeysController::NextDispatchEvent(
- scoped_ptr<ui::Event>* new_event) {
+ std::unique_ptr<ui::Event>* new_event) {
DCHECK(new_event);
new_event->reset();
int remaining = shift_sticky_key_->GetModifierUpEvent(new_event) +
@@ -309,7 +309,8 @@ bool StickyKeysHandler::HandleScrollEvent(
return false;
}
-int StickyKeysHandler::GetModifierUpEvent(scoped_ptr<ui::Event>* new_event) {
+int StickyKeysHandler::GetModifierUpEvent(
+ std::unique_ptr<ui::Event>* new_event) {
if (current_state_ != STICKY_KEY_STATE_DISABLED || !modifier_up_event_)
return 0;
DCHECK(new_event);
« no previous file with comments | « ash/sticky_keys/sticky_keys_controller.h ('k') | ash/sticky_keys/sticky_keys_overlay.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698