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

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

Issue 106433007: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 7 years 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) 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 13 matching lines...) Expand all
24 #include "extensions/common/error_utils.h" 24 #include "extensions/common/error_utils.h"
25 #include "extensions/common/manifest_handlers/background_info.h" 25 #include "extensions/common/manifest_handlers/background_info.h"
26 26
27 namespace keys = extension_accessibility_api_constants; 27 namespace keys = extension_accessibility_api_constants;
28 namespace experimental_accessibility = 28 namespace experimental_accessibility =
29 extensions::api::experimental_accessibility; 29 extensions::api::experimental_accessibility;
30 30
31 // Returns the AccessibilityControlInfo serialized into a JSON string, 31 // Returns the AccessibilityControlInfo serialized into a JSON string,
32 // consisting of an array of a single object of type AccessibilityObject, 32 // consisting of an array of a single object of type AccessibilityObject,
33 // as defined in the accessibility extension api's json schema. 33 // as defined in the accessibility extension api's json schema.
34 scoped_ptr<ListValue> ControlInfoToEventArguments( 34 scoped_ptr<base::ListValue> ControlInfoToEventArguments(
35 const AccessibilityEventInfo* info) { 35 const AccessibilityEventInfo* info) {
36 DictionaryValue* dict = new DictionaryValue(); 36 base::DictionaryValue* dict = new base::DictionaryValue();
37 info->SerializeToDict(dict); 37 info->SerializeToDict(dict);
38 38
39 scoped_ptr<ListValue> args(new ListValue()); 39 scoped_ptr<base::ListValue> args(new base::ListValue());
40 args->Append(dict); 40 args->Append(dict);
41 return args.Pass(); 41 return args.Pass();
42 } 42 }
43 43
44 ExtensionAccessibilityEventRouter* 44 ExtensionAccessibilityEventRouter*
45 ExtensionAccessibilityEventRouter::GetInstance() { 45 ExtensionAccessibilityEventRouter::GetInstance() {
46 return Singleton<ExtensionAccessibilityEventRouter>::get(); 46 return Singleton<ExtensionAccessibilityEventRouter>::get();
47 } 47 }
48 48
49 ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter() 49 ExtensionAccessibilityEventRouter::ExtensionAccessibilityEventRouter()
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 case ui::AccessibilityTypes::EVENT_FOCUS: 120 case ui::AccessibilityTypes::EVENT_FOCUS:
121 OnControlFocused(info); 121 OnControlFocused(info);
122 break; 122 break;
123 default: 123 default:
124 NOTREACHED(); 124 NOTREACHED();
125 } 125 }
126 } 126 }
127 127
128 void ExtensionAccessibilityEventRouter::OnWindowOpened( 128 void ExtensionAccessibilityEventRouter::OnWindowOpened(
129 const AccessibilityWindowInfo* info) { 129 const AccessibilityWindowInfo* info) {
130 scoped_ptr<ListValue> args(ControlInfoToEventArguments(info)); 130 scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
131 DispatchEvent(info->profile(), 131 DispatchEvent(info->profile(),
132 experimental_accessibility::OnWindowOpened::kEventName, 132 experimental_accessibility::OnWindowOpened::kEventName,
133 args.Pass()); 133 args.Pass());
134 } 134 }
135 135
136 void ExtensionAccessibilityEventRouter::OnControlFocused( 136 void ExtensionAccessibilityEventRouter::OnControlFocused(
137 const AccessibilityControlInfo* info) { 137 const AccessibilityControlInfo* info) {
138 last_focused_control_dict_.Clear(); 138 last_focused_control_dict_.Clear();
139 info->SerializeToDict(&last_focused_control_dict_); 139 info->SerializeToDict(&last_focused_control_dict_);
140 scoped_ptr<ListValue> args(ControlInfoToEventArguments(info)); 140 scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
141 DispatchEvent(info->profile(), 141 DispatchEvent(info->profile(),
142 experimental_accessibility::OnControlFocused::kEventName, 142 experimental_accessibility::OnControlFocused::kEventName,
143 args.Pass()); 143 args.Pass());
144 } 144 }
145 145
146 void ExtensionAccessibilityEventRouter::OnControlAction( 146 void ExtensionAccessibilityEventRouter::OnControlAction(
147 const AccessibilityControlInfo* info) { 147 const AccessibilityControlInfo* info) {
148 scoped_ptr<ListValue> args(ControlInfoToEventArguments(info)); 148 scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
149 DispatchEvent(info->profile(), 149 DispatchEvent(info->profile(),
150 experimental_accessibility::OnControlAction::kEventName, 150 experimental_accessibility::OnControlAction::kEventName,
151 args.Pass()); 151 args.Pass());
152 } 152 }
153 153
154 void ExtensionAccessibilityEventRouter::OnTextChanged( 154 void ExtensionAccessibilityEventRouter::OnTextChanged(
155 const AccessibilityControlInfo* info) { 155 const AccessibilityControlInfo* info) {
156 scoped_ptr<ListValue> args(ControlInfoToEventArguments(info)); 156 scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
157 DispatchEvent(info->profile(), 157 DispatchEvent(info->profile(),
158 experimental_accessibility::OnTextChanged::kEventName, 158 experimental_accessibility::OnTextChanged::kEventName,
159 args.Pass()); 159 args.Pass());
160 } 160 }
161 161
162 void ExtensionAccessibilityEventRouter::OnMenuOpened( 162 void ExtensionAccessibilityEventRouter::OnMenuOpened(
163 const AccessibilityMenuInfo* info) { 163 const AccessibilityMenuInfo* info) {
164 scoped_ptr<ListValue> args(ControlInfoToEventArguments(info)); 164 scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
165 DispatchEvent(info->profile(), 165 DispatchEvent(info->profile(),
166 experimental_accessibility::OnMenuOpened::kEventName, 166 experimental_accessibility::OnMenuOpened::kEventName,
167 args.Pass()); 167 args.Pass());
168 } 168 }
169 169
170 void ExtensionAccessibilityEventRouter::OnMenuClosed( 170 void ExtensionAccessibilityEventRouter::OnMenuClosed(
171 const AccessibilityMenuInfo* info) { 171 const AccessibilityMenuInfo* info) {
172 scoped_ptr<ListValue> args(ControlInfoToEventArguments(info)); 172 scoped_ptr<base::ListValue> args(ControlInfoToEventArguments(info));
173 DispatchEvent(info->profile(), 173 DispatchEvent(info->profile(),
174 experimental_accessibility::OnMenuClosed::kEventName, 174 experimental_accessibility::OnMenuClosed::kEventName,
175 args.Pass()); 175 args.Pass());
176 } 176 }
177 177
178 void ExtensionAccessibilityEventRouter::OnChromeVoxLoadStateChanged( 178 void ExtensionAccessibilityEventRouter::OnChromeVoxLoadStateChanged(
179 Profile* profile, 179 Profile* profile,
180 bool loading, 180 bool loading,
181 bool make_announcements) { 181 bool make_announcements) {
182 scoped_ptr<base::ListValue> event_args(new base::ListValue()); 182 scoped_ptr<base::ListValue> event_args(new base::ListValue());
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 } 235 }
236 return true; 236 return true;
237 } 237 }
238 238
239 bool AccessibilityGetFocusedControlFunction::RunImpl() { 239 bool AccessibilityGetFocusedControlFunction::RunImpl() {
240 // Get the serialized dict from the last focused control and return it. 240 // Get the serialized dict from the last focused control and return it.
241 // However, if the dict is empty, that means we haven't seen any focus 241 // However, if the dict is empty, that means we haven't seen any focus
242 // events yet, so return null instead. 242 // events yet, so return null instead.
243 ExtensionAccessibilityEventRouter *accessibility_event_router = 243 ExtensionAccessibilityEventRouter *accessibility_event_router =
244 ExtensionAccessibilityEventRouter::GetInstance(); 244 ExtensionAccessibilityEventRouter::GetInstance();
245 DictionaryValue *last_focused_control_dict = 245 base::DictionaryValue *last_focused_control_dict =
246 accessibility_event_router->last_focused_control_dict(); 246 accessibility_event_router->last_focused_control_dict();
247 if (last_focused_control_dict->size()) { 247 if (last_focused_control_dict->size()) {
248 SetResult(last_focused_control_dict->DeepCopyWithoutEmptyChildren()); 248 SetResult(last_focused_control_dict->DeepCopyWithoutEmptyChildren());
249 } else { 249 } else {
250 SetResult(Value::CreateNullValue()); 250 SetResult(base::Value::CreateNullValue());
251 } 251 }
252 return true; 252 return true;
253 } 253 }
254 254
255 bool AccessibilityGetAlertsForTabFunction::RunImpl() { 255 bool AccessibilityGetAlertsForTabFunction::RunImpl() {
256 int tab_id; 256 int tab_id;
257 EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id)); 257 EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id));
258 258
259 TabStripModel* tab_strip = NULL; 259 TabStripModel* tab_strip = NULL;
260 content::WebContents* contents = NULL; 260 content::WebContents* contents = NULL;
261 int tab_index = -1; 261 int tab_index = -1;
262 if (!extensions::ExtensionTabUtil::GetTabById(tab_id, 262 if (!extensions::ExtensionTabUtil::GetTabById(tab_id,
263 GetProfile(), 263 GetProfile(),
264 include_incognito(), 264 include_incognito(),
265 NULL, 265 NULL,
266 &tab_strip, 266 &tab_strip,
267 &contents, 267 &contents,
268 &tab_index)) { 268 &tab_index)) {
269 error_ = extensions::ErrorUtils::FormatErrorMessage( 269 error_ = extensions::ErrorUtils::FormatErrorMessage(
270 extensions::tabs_constants::kTabNotFoundError, 270 extensions::tabs_constants::kTabNotFoundError,
271 base::IntToString(tab_id)); 271 base::IntToString(tab_id));
272 return false; 272 return false;
273 } 273 }
274 274
275 ListValue* alerts_value = new ListValue; 275 base::ListValue* alerts_value = new base::ListValue;
276 276
277 InfoBarService* infobar_service = InfoBarService::FromWebContents(contents); 277 InfoBarService* infobar_service = InfoBarService::FromWebContents(contents);
278 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) { 278 for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
279 // TODO(hashimoto): Make other kind of alerts available. crosbug.com/24281 279 // TODO(hashimoto): Make other kind of alerts available. crosbug.com/24281
280 ConfirmInfoBarDelegate* confirm_infobar_delegate = 280 ConfirmInfoBarDelegate* confirm_infobar_delegate =
281 infobar_service->infobar_at(i)->delegate()->AsConfirmInfoBarDelegate(); 281 infobar_service->infobar_at(i)->delegate()->AsConfirmInfoBarDelegate();
282 if (confirm_infobar_delegate) { 282 if (confirm_infobar_delegate) {
283 DictionaryValue* alert_value = new DictionaryValue; 283 base::DictionaryValue* alert_value = new base::DictionaryValue;
284 const base::string16 message_text = 284 const base::string16 message_text =
285 confirm_infobar_delegate->GetMessageText(); 285 confirm_infobar_delegate->GetMessageText();
286 alert_value->SetString(keys::kMessageKey, message_text); 286 alert_value->SetString(keys::kMessageKey, message_text);
287 alerts_value->Append(alert_value); 287 alerts_value->Append(alert_value);
288 } 288 }
289 } 289 }
290 290
291 SetResult(alerts_value); 291 SetResult(alerts_value);
292 return true; 292 return true;
293 } 293 }
OLDNEW
« no previous file with comments | « chrome/browser/accessibility/accessibility_extension_api.h ('k') | chrome/browser/android/foreign_session_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698