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

Side by Side Diff: ash/accelerators/spoken_feedback_toggler.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: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/accelerators/spoken_feedback_toggler.h" 5 #include "ash/accelerators/spoken_feedback_toggler.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "ash/accelerators/key_hold_detector.h" 9 #include "ash/accelerators/key_hold_detector.h"
10 #include "ash/accessibility_delegate.h" 10 #include "ash/accessibility_delegate.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ui/events/event.h" 12 #include "ui/events/event.h"
13 13
14 namespace ash { 14 namespace ash {
15 namespace { 15 namespace {
16 bool speech_feedback_toggler_enabled = false; 16 bool speech_feedback_toggler_enabled = false;
17 } 17 }
18 18
19 // static 19 // static
20 bool SpokenFeedbackToggler::IsEnabled() { 20 bool SpokenFeedbackToggler::IsEnabled() {
21 return speech_feedback_toggler_enabled; 21 return speech_feedback_toggler_enabled;
22 } 22 }
23 23
24 // static 24 // static
25 void SpokenFeedbackToggler::SetEnabled(bool enabled) { 25 void SpokenFeedbackToggler::SetEnabled(bool enabled) {
26 speech_feedback_toggler_enabled = enabled; 26 speech_feedback_toggler_enabled = enabled;
27 } 27 }
28 28
29 // static 29 // static
30 scoped_ptr<ui::EventHandler> SpokenFeedbackToggler::CreateHandler() { 30 std::unique_ptr<ui::EventHandler> SpokenFeedbackToggler::CreateHandler() {
31 scoped_ptr<KeyHoldDetector::Delegate> delegate(new SpokenFeedbackToggler()); 31 std::unique_ptr<KeyHoldDetector::Delegate> delegate(
32 return scoped_ptr<ui::EventHandler>(new KeyHoldDetector(std::move(delegate))); 32 new SpokenFeedbackToggler());
33 return std::unique_ptr<ui::EventHandler>(
34 new KeyHoldDetector(std::move(delegate)));
33 } 35 }
34 36
35 bool SpokenFeedbackToggler::ShouldProcessEvent( 37 bool SpokenFeedbackToggler::ShouldProcessEvent(
36 const ui::KeyEvent* event) const { 38 const ui::KeyEvent* event) const {
37 return IsEnabled() && event->key_code() == ui::VKEY_F6; 39 return IsEnabled() && event->key_code() == ui::VKEY_F6;
38 } 40 }
39 41
40 bool SpokenFeedbackToggler::IsStartEvent(const ui::KeyEvent* event) const { 42 bool SpokenFeedbackToggler::IsStartEvent(const ui::KeyEvent* event) const {
41 return event->type() == ui::ET_KEY_PRESSED && 43 return event->type() == ui::ET_KEY_PRESSED &&
42 event->flags() & ui::EF_SHIFT_DOWN; 44 event->flags() & ui::EF_SHIFT_DOWN;
(...skipping 14 matching lines...) Expand all
57 59
58 void SpokenFeedbackToggler::OnKeyUnhold(const ui::KeyEvent* event) { 60 void SpokenFeedbackToggler::OnKeyUnhold(const ui::KeyEvent* event) {
59 toggled_ = false; 61 toggled_ = false;
60 } 62 }
61 63
62 SpokenFeedbackToggler::SpokenFeedbackToggler() : toggled_(false) {} 64 SpokenFeedbackToggler::SpokenFeedbackToggler() : toggled_(false) {}
63 65
64 SpokenFeedbackToggler::~SpokenFeedbackToggler() {} 66 SpokenFeedbackToggler::~SpokenFeedbackToggler() {}
65 67
66 } // namespace ash 68 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698