| 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);
|
|
|