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

Side by Side Diff: chrome/browser/accessibility/accessibility_extension_api.cc

Issue 74083003: Allow controls other than windows to send alert accessibility events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: rebase Created 7 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/accessibility/accessibility_event_router_views.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/accessibility/accessibility_extension_api.h" 5 #include "chrome/browser/accessibility/accessibility_extension_api.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h" 10 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 control_event_callback_ = control_event_callback; 68 control_event_callback_ = control_event_callback;
69 } 69 }
70 70
71 void ExtensionAccessibilityEventRouter::ClearControlEventCallback() { 71 void ExtensionAccessibilityEventRouter::ClearControlEventCallback() {
72 control_event_callback_.Reset(); 72 control_event_callback_.Reset();
73 } 73 }
74 74
75 void ExtensionAccessibilityEventRouter::HandleWindowEvent( 75 void ExtensionAccessibilityEventRouter::HandleWindowEvent(
76 ui::AccessibilityTypes::Event event, 76 ui::AccessibilityTypes::Event event,
77 const AccessibilityWindowInfo* info) { 77 const AccessibilityWindowInfo* info) {
78 if (!control_event_callback_.is_null())
79 control_event_callback_.Run(event, info);
80
78 if (event == ui::AccessibilityTypes::EVENT_ALERT) 81 if (event == ui::AccessibilityTypes::EVENT_ALERT)
79 OnWindowOpened(info); 82 OnWindowOpened(info);
80 } 83 }
81 84
82 void ExtensionAccessibilityEventRouter::HandleMenuEvent( 85 void ExtensionAccessibilityEventRouter::HandleMenuEvent(
83 ui::AccessibilityTypes::Event event, 86 ui::AccessibilityTypes::Event event,
84 const AccessibilityMenuInfo* info) { 87 const AccessibilityMenuInfo* info) {
85 switch (event) { 88 switch (event) {
86 case ui::AccessibilityTypes::EVENT_MENUSTART: 89 case ui::AccessibilityTypes::EVENT_MENUSTART:
87 case ui::AccessibilityTypes::EVENT_MENUPOPUPSTART: 90 case ui::AccessibilityTypes::EVENT_MENUPOPUPSTART:
(...skipping 16 matching lines...) Expand all
104 const AccessibilityControlInfo* info) { 107 const AccessibilityControlInfo* info) {
105 if (!control_event_callback_.is_null()) 108 if (!control_event_callback_.is_null())
106 control_event_callback_.Run(event, info); 109 control_event_callback_.Run(event, info);
107 110
108 switch (event) { 111 switch (event) {
109 case ui::AccessibilityTypes::EVENT_TEXT_CHANGED: 112 case ui::AccessibilityTypes::EVENT_TEXT_CHANGED:
110 case ui::AccessibilityTypes::EVENT_SELECTION_CHANGED: 113 case ui::AccessibilityTypes::EVENT_SELECTION_CHANGED:
111 OnTextChanged(info); 114 OnTextChanged(info);
112 break; 115 break;
113 case ui::AccessibilityTypes::EVENT_VALUE_CHANGED: 116 case ui::AccessibilityTypes::EVENT_VALUE_CHANGED:
117 case ui::AccessibilityTypes::EVENT_ALERT:
114 OnControlAction(info); 118 OnControlAction(info);
115 break; 119 break;
116 case ui::AccessibilityTypes::EVENT_FOCUS: 120 case ui::AccessibilityTypes::EVENT_FOCUS:
117 OnControlFocused(info); 121 OnControlFocused(info);
118 break; 122 break;
119 default: 123 default:
120 NOTREACHED(); 124 NOTREACHED();
121 } 125 }
122 } 126 }
123 127
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 DictionaryValue* alert_value = new DictionaryValue; 283 DictionaryValue* alert_value = new DictionaryValue;
280 const string16 message_text = confirm_infobar_delegate->GetMessageText(); 284 const string16 message_text = confirm_infobar_delegate->GetMessageText();
281 alert_value->SetString(keys::kMessageKey, message_text); 285 alert_value->SetString(keys::kMessageKey, message_text);
282 alerts_value->Append(alert_value); 286 alerts_value->Append(alert_value);
283 } 287 }
284 } 288 }
285 289
286 SetResult(alerts_value); 290 SetResult(alerts_value);
287 return true; 291 return true;
288 } 292 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/accessibility/accessibility_event_router_views.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698