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

Side by Side Diff: ash/accelerators/spoken_feedback_toggler.cc

Issue 1551133002: Convert Pass()→std::move() in //ash (CrOS edition) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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>
8
7 #include "ash/accelerators/key_hold_detector.h" 9 #include "ash/accelerators/key_hold_detector.h"
8 #include "ash/accessibility_delegate.h" 10 #include "ash/accessibility_delegate.h"
9 #include "ash/shell.h" 11 #include "ash/shell.h"
10 #include "ui/events/event.h" 12 #include "ui/events/event.h"
11 13
12 namespace ash { 14 namespace ash {
13 namespace { 15 namespace {
14 bool speech_feedback_toggler_enabled = false; 16 bool speech_feedback_toggler_enabled = false;
15 } 17 }
16 18
17 // static 19 // static
18 bool SpokenFeedbackToggler::IsEnabled() { 20 bool SpokenFeedbackToggler::IsEnabled() {
19 return speech_feedback_toggler_enabled; 21 return speech_feedback_toggler_enabled;
20 } 22 }
21 23
22 // static 24 // static
23 void SpokenFeedbackToggler::SetEnabled(bool enabled) { 25 void SpokenFeedbackToggler::SetEnabled(bool enabled) {
24 speech_feedback_toggler_enabled = enabled; 26 speech_feedback_toggler_enabled = enabled;
25 } 27 }
26 28
27 // static 29 // static
28 scoped_ptr<ui::EventHandler> SpokenFeedbackToggler::CreateHandler() { 30 scoped_ptr<ui::EventHandler> SpokenFeedbackToggler::CreateHandler() {
29 scoped_ptr<KeyHoldDetector::Delegate> delegate(new SpokenFeedbackToggler()); 31 scoped_ptr<KeyHoldDetector::Delegate> delegate(new SpokenFeedbackToggler());
30 return scoped_ptr<ui::EventHandler>(new KeyHoldDetector(delegate.Pass())); 32 return scoped_ptr<ui::EventHandler>(new KeyHoldDetector(std::move(delegate)));
31 } 33 }
32 34
33 bool SpokenFeedbackToggler::ShouldProcessEvent( 35 bool SpokenFeedbackToggler::ShouldProcessEvent(
34 const ui::KeyEvent* event) const { 36 const ui::KeyEvent* event) const {
35 return IsEnabled() && event->key_code() == ui::VKEY_F6; 37 return IsEnabled() && event->key_code() == ui::VKEY_F6;
36 } 38 }
37 39
38 bool SpokenFeedbackToggler::IsStartEvent(const ui::KeyEvent* event) const { 40 bool SpokenFeedbackToggler::IsStartEvent(const ui::KeyEvent* event) const {
39 return event->type() == ui::ET_KEY_PRESSED && 41 return event->type() == ui::ET_KEY_PRESSED &&
40 event->flags() & ui::EF_SHIFT_DOWN; 42 event->flags() & ui::EF_SHIFT_DOWN;
(...skipping 14 matching lines...) Expand all
55 57
56 void SpokenFeedbackToggler::OnKeyUnhold(const ui::KeyEvent* event) { 58 void SpokenFeedbackToggler::OnKeyUnhold(const ui::KeyEvent* event) {
57 toggled_ = false; 59 toggled_ = false;
58 } 60 }
59 61
60 SpokenFeedbackToggler::SpokenFeedbackToggler() : toggled_(false) {} 62 SpokenFeedbackToggler::SpokenFeedbackToggler() : toggled_(false) {}
61 63
62 SpokenFeedbackToggler::~SpokenFeedbackToggler() {} 64 SpokenFeedbackToggler::~SpokenFeedbackToggler() {}
63 65
64 } // namespace ash 66 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/magnifier_key_scroller.cc ('k') | ash/display/display_color_manager_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698