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

Side by Side Diff: chrome/browser/extensions/extension_accessibility_api.cc

Issue 7708025: Adds extension APIs of events on changing volume. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix (to be commited) Created 9 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/extensions/extension_tabs_module.h" 5 #include "chrome/browser/extensions/extension_tabs_module.h"
6 6
7 #include "base/json/json_writer.h" 7 #include "base/json/json_writer.h"
8 #include "base/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/extensions/extension_accessibility_api.h" 11 #include "chrome/browser/extensions/extension_accessibility_api.h"
12 #include "chrome/browser/extensions/extension_accessibility_api_constants.h" 12 #include "chrome/browser/extensions/extension_accessibility_api_constants.h"
13 #include "chrome/browser/extensions/extension_event_router.h" 13 #include "chrome/browser/extensions/extension_event_router.h"
14 #include "chrome/browser/extensions/extension_function_dispatcher.h" 14 #include "chrome/browser/extensions/extension_function_dispatcher.h"
15 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/browser_list.h" 17 #include "chrome/browser/ui/browser_list.h"
18 #include "chrome/browser/ui/browser_window.h" 18 #include "chrome/browser/ui/browser_window.h"
19 #include "chrome/common/chrome_notification_types.h" 19 #include "chrome/common/chrome_notification_types.h"
20 #include "chrome/common/extensions/extension.h" 20 #include "chrome/common/extensions/extension.h"
21 #include "content/common/notification_service.h" 21 #include "content/common/notification_service.h"
22 22
23 namespace keys = extension_accessibility_api_constants; 23 namespace keys = extension_accessibility_api_constants;
24 24
25 // Returns the AccessibilityControlInfo serialized into a JSON string, 25 // Returns the AccessibilityControlInfo serialized into a JSON string,
26 // consisting of an array of a single object of type AccessibilityObject, 26 // consisting of an array of a single object of type AccessibilityObject,
27 // as defined in the accessibility extension api's json schema. 27 // as defined in the accessibility extension api's json schema.
28 std::string ControlInfoToJsonString(const AccessibilityControlInfo* info) { 28 std::string ControlInfoToJsonString(const AccessibilityEventInfo* info) {
29 ListValue args; 29 ListValue args;
30 DictionaryValue* dict = new DictionaryValue(); 30 DictionaryValue* dict = new DictionaryValue();
31 info->SerializeToDict(dict); 31 info->SerializeToDict(dict);
32 args.Append(dict); 32 args.Append(dict);
33 std::string json_args; 33 std::string json_args;
34 base::JSONWriter::Write(&args, false, &json_args); 34 base::JSONWriter::Write(&args, false, &json_args);
35 return json_args; 35 return json_args;
36 } 36 }
37 37
38 ExtensionAccessibilityEventRouter* 38 ExtensionAccessibilityEventRouter*
(...skipping 27 matching lines...) Expand all
66 NotificationService::AllSources()); 66 NotificationService::AllSources());
67 registrar_.Add(this, 67 registrar_.Add(this,
68 chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED, 68 chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED,
69 NotificationService::AllSources()); 69 NotificationService::AllSources());
70 registrar_.Add(this, 70 registrar_.Add(this,
71 chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED, 71 chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED,
72 NotificationService::AllSources()); 72 NotificationService::AllSources());
73 registrar_.Add(this, 73 registrar_.Add(this,
74 chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED, 74 chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED,
75 NotificationService::AllSources()); 75 NotificationService::AllSources());
76 registrar_.Add(this,
77 chrome::NOTIFICATION_ACCESSIBILITY_VOLUME_CHANGED,
78 NotificationService::AllSources());
76 } 79 }
77 } 80 }
78 81
79 void ExtensionAccessibilityEventRouter::Observe( 82 void ExtensionAccessibilityEventRouter::Observe(
80 int type, 83 int type,
81 const NotificationSource& source, 84 const NotificationSource& source,
82 const NotificationDetails& details) { 85 const NotificationDetails& details) {
83 switch (type) { 86 switch (type) {
84 case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED: 87 case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_OPENED:
85 OnWindowOpened(Details<const AccessibilityWindowInfo>(details).ptr()); 88 OnWindowOpened(Details<const AccessibilityWindowInfo>(details).ptr());
86 break; 89 break;
87 case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED: 90 case chrome::NOTIFICATION_ACCESSIBILITY_WINDOW_CLOSED:
88 OnWindowClosed(Details<const AccessibilityWindowInfo>(details).ptr()); 91 OnWindowClosed(Details<const AccessibilityWindowInfo>(details).ptr());
89 break; 92 break;
90 case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED: 93 case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED:
91 OnControlFocused(Details<const AccessibilityControlInfo>(details).ptr()); 94 OnControlFocused(Details<const AccessibilityControlInfo>(details).ptr());
92 break; 95 break;
93 case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION: 96 case chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_ACTION:
94 OnControlAction(Details<const AccessibilityControlInfo>(details).ptr()); 97 OnControlAction(Details<const AccessibilityControlInfo>(details).ptr());
95 break; 98 break;
96 case chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED: 99 case chrome::NOTIFICATION_ACCESSIBILITY_TEXT_CHANGED:
97 OnTextChanged(Details<const AccessibilityControlInfo>(details).ptr()); 100 OnTextChanged(Details<const AccessibilityControlInfo>(details).ptr());
98 break; 101 break;
99 case chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED: 102 case chrome::NOTIFICATION_ACCESSIBILITY_MENU_OPENED:
100 OnMenuOpened(Details<const AccessibilityMenuInfo>(details).ptr()); 103 OnMenuOpened(Details<const AccessibilityMenuInfo>(details).ptr());
101 break; 104 break;
102 case chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED: 105 case chrome::NOTIFICATION_ACCESSIBILITY_MENU_CLOSED:
103 OnMenuClosed(Details<const AccessibilityMenuInfo>(details).ptr()); 106 OnMenuClosed(Details<const AccessibilityMenuInfo>(details).ptr());
104 break; 107 break;
108 case chrome::NOTIFICATION_ACCESSIBILITY_VOLUME_CHANGED:
109 OnVolumeChanged(Details<const AccessibilityVolumeInfo>(details).ptr());
110 break;
105 default: 111 default:
106 NOTREACHED(); 112 NOTREACHED();
107 } 113 }
108 } 114 }
109 115
110 void ExtensionAccessibilityEventRouter::SetAccessibilityEnabled(bool enabled) { 116 void ExtensionAccessibilityEventRouter::SetAccessibilityEnabled(bool enabled) {
111 if (enabled_ != enabled) { 117 if (enabled_ != enabled) {
112 enabled_ = enabled; 118 enabled_ = enabled;
113 if (enabled_) { 119 if (enabled_) {
114 for (unsigned int i = 0; i < on_enabled_listeners_.size(); i++) { 120 for (unsigned int i = 0; i < on_enabled_listeners_.size(); i++) {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 std::string json_args = ControlInfoToJsonString(info); 179 std::string json_args = ControlInfoToJsonString(info);
174 DispatchEvent(info->profile(), keys::kOnMenuOpened, json_args); 180 DispatchEvent(info->profile(), keys::kOnMenuOpened, json_args);
175 } 181 }
176 182
177 void ExtensionAccessibilityEventRouter::OnMenuClosed( 183 void ExtensionAccessibilityEventRouter::OnMenuClosed(
178 const AccessibilityMenuInfo* info) { 184 const AccessibilityMenuInfo* info) {
179 std::string json_args = ControlInfoToJsonString(info); 185 std::string json_args = ControlInfoToJsonString(info);
180 DispatchEvent(info->profile(), keys::kOnMenuClosed, json_args); 186 DispatchEvent(info->profile(), keys::kOnMenuClosed, json_args);
181 } 187 }
182 188
189 void ExtensionAccessibilityEventRouter::OnVolumeChanged(
190 const AccessibilityVolumeInfo* info) {
191 std::string json_args = ControlInfoToJsonString(info);
192 DispatchEvent(info->profile(), keys::kOnVolumeChanged, json_args);
193 }
194
183 void ExtensionAccessibilityEventRouter::DispatchEvent( 195 void ExtensionAccessibilityEventRouter::DispatchEvent(
184 Profile* profile, 196 Profile* profile,
185 const char* event_name, 197 const char* event_name,
186 const std::string& json_args) { 198 const std::string& json_args) {
187 if (enabled_ && profile && profile->GetExtensionEventRouter()) { 199 if (enabled_ && profile && profile->GetExtensionEventRouter()) {
188 profile->GetExtensionEventRouter()->DispatchEventToRenderers( 200 profile->GetExtensionEventRouter()->DispatchEventToRenderers(
189 event_name, json_args, NULL, GURL()); 201 event_name, json_args, NULL, GURL());
190 } 202 }
191 } 203 }
192 204
(...skipping 13 matching lines...) Expand all
206 ExtensionAccessibilityEventRouter::GetInstance(); 218 ExtensionAccessibilityEventRouter::GetInstance();
207 DictionaryValue *last_focused_control_dict = 219 DictionaryValue *last_focused_control_dict =
208 accessibility_event_router->last_focused_control_dict(); 220 accessibility_event_router->last_focused_control_dict();
209 if (last_focused_control_dict->size()) { 221 if (last_focused_control_dict->size()) {
210 result_.reset(last_focused_control_dict->DeepCopyWithoutEmptyChildren()); 222 result_.reset(last_focused_control_dict->DeepCopyWithoutEmptyChildren());
211 } else { 223 } else {
212 result_.reset(Value::CreateNullValue()); 224 result_.reset(Value::CreateNullValue());
213 } 225 }
214 return true; 226 return true;
215 } 227 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698