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: chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.cc

Issue 2712963003: mustash: Use ui::chromeos::EventRewriter in mus (Closed)
Patch Set: Fix build issues. Created 3 years, 9 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h " 5 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h "
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
11 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 11 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
12 #include "chrome/browser/chromeos/accessibility/event_handler_common.h" 12 #include "chrome/browser/chromeos/accessibility/event_handler_common.h"
13 #include "chrome/common/extensions/extension_constants.h" 13 #include "chrome/common/extensions/extension_constants.h"
14 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
15 #include "extensions/browser/event_router.h" 15 #include "extensions/browser/event_router.h"
16 #include "extensions/browser/extension_host.h" 16 #include "extensions/browser/extension_host.h"
17 #include "ui/aura/window_tree_host.h" 17 #include "ui/aura/window_tree_host.h"
18 #include "ui/content_accelerators/accelerator_util.h" 18 #include "ui/content_accelerators/accelerator_util.h"
19 #include "ui/events/event.h" 19 #include "ui/events/event.h"
20 #include "ui/events/event_processor.h" 20 #include "ui/events/event_sink.h"
21 21
22 SpokenFeedbackEventRewriterDelegate::SpokenFeedbackEventRewriterDelegate() {} 22 SpokenFeedbackEventRewriterDelegate::SpokenFeedbackEventRewriterDelegate() {}
23 23
24 bool SpokenFeedbackEventRewriterDelegate::IsSpokenFeedbackEnabled() const { 24 bool SpokenFeedbackEventRewriterDelegate::IsSpokenFeedbackEnabled() const {
25 return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled(); 25 return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled();
26 } 26 }
27 27
28 bool SpokenFeedbackEventRewriterDelegate::DispatchKeyEventToChromeVox( 28 bool SpokenFeedbackEventRewriterDelegate::DispatchKeyEventToChromeVox(
29 const ui::KeyEvent& key_event, 29 const ui::KeyEvent& key_event,
30 bool capture) { 30 bool capture) {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 63
64 void SpokenFeedbackEventRewriterDelegate::HandleKeyboardEvent( 64 void SpokenFeedbackEventRewriterDelegate::HandleKeyboardEvent(
65 content::WebContents* source, 65 content::WebContents* source,
66 const content::NativeWebKeyboardEvent& event) { 66 const content::NativeWebKeyboardEvent& event) {
67 ui::KeyEvent key_event(*static_cast<ui::KeyEvent*>(event.os_event)); 67 ui::KeyEvent key_event(*static_cast<ui::KeyEvent*>(event.os_event));
68 68
69 if ((key_event.key_code() >= ui::VKEY_F1) && 69 if ((key_event.key_code() >= ui::VKEY_F1) &&
70 (key_event.key_code() <= ui::VKEY_F12)) 70 (key_event.key_code() <= ui::VKEY_F12))
71 return; 71 return;
72 72
73 ui::EventProcessor* processor = 73 ui::EventSink* sink =
74 ash::Shell::GetPrimaryRootWindow()->GetHost()->event_processor(); 74 ash::Shell::GetPrimaryRootWindow()->GetHost()->event_sink();
75 75
76 if (processor->OnEventFromSource(&key_event).dispatcher_destroyed) { 76 if (sink->OnEventFromSource(&key_event).dispatcher_destroyed) {
77 VLOG(0) << "Undispatched key " << key_event.key_code() 77 VLOG(0) << "Undispatched key " << key_event.key_code()
78 << " due to destroyed dispatcher."; 78 << " due to destroyed dispatcher.";
79 } 79 }
80 } 80 }
81 81
82 SpokenFeedbackEventRewriter::SpokenFeedbackEventRewriter() { 82 SpokenFeedbackEventRewriter::SpokenFeedbackEventRewriter() {
83 delegate_.reset(new SpokenFeedbackEventRewriterDelegate()); 83 delegate_.reset(new SpokenFeedbackEventRewriterDelegate());
84 } 84 }
85 85
86 SpokenFeedbackEventRewriter::~SpokenFeedbackEventRewriter() { 86 SpokenFeedbackEventRewriter::~SpokenFeedbackEventRewriter() {
(...skipping 25 matching lines...) Expand all
112 if (delegate_->DispatchKeyEventToChromeVox(key_event, capture)) 112 if (delegate_->DispatchKeyEventToChromeVox(key_event, capture))
113 return ui::EVENT_REWRITE_DISCARD; 113 return ui::EVENT_REWRITE_DISCARD;
114 return ui::EVENT_REWRITE_CONTINUE; 114 return ui::EVENT_REWRITE_CONTINUE;
115 } 115 }
116 116
117 ui::EventRewriteStatus SpokenFeedbackEventRewriter::NextDispatchEvent( 117 ui::EventRewriteStatus SpokenFeedbackEventRewriter::NextDispatchEvent(
118 const ui::Event& last_event, 118 const ui::Event& last_event,
119 std::unique_ptr<ui::Event>* new_event) { 119 std::unique_ptr<ui::Event>* new_event) {
120 return ui::EVENT_REWRITE_CONTINUE; 120 return ui::EVENT_REWRITE_CONTINUE;
121 } 121 }
OLDNEW
« no previous file with comments | « ash/wm/window_manager_unittest.cc ('k') | chrome/browser/chromeos/events/event_rewriter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698