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

Side by Side Diff: content/browser/accessibility/accessibility_ui.cc

Issue 1995113002: Rename WebUI::CallJavascriptFunction to WebUI::CallJavascriptFunctionUnsafe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "content/browser/accessibility/accessibility_ui.h" 5 #include "content/browser/accessibility/accessibility_ui.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/json/json_writer.h" 9 #include "base/json/json_writer.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 CHECK(args->GetString(1, &route_id_str)); 223 CHECK(args->GetString(1, &route_id_str));
224 CHECK(base::StringToInt(process_id_str, &process_id)); 224 CHECK(base::StringToInt(process_id_str, &process_id));
225 CHECK(base::StringToInt(route_id_str, &route_id)); 225 CHECK(base::StringToInt(route_id_str, &route_id));
226 226
227 RenderViewHost* rvh = RenderViewHost::FromID(process_id, route_id); 227 RenderViewHost* rvh = RenderViewHost::FromID(process_id, route_id);
228 if (!rvh) { 228 if (!rvh) {
229 std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue()); 229 std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
230 result->SetInteger(kProcessIdField, process_id); 230 result->SetInteger(kProcessIdField, process_id);
231 result->SetInteger(kRouteIdField, route_id); 231 result->SetInteger(kRouteIdField, route_id);
232 result->Set("error", new base::StringValue("Renderer no longer exists.")); 232 result->Set("error", new base::StringValue("Renderer no longer exists."));
233 web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get())); 233 web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree",
234 *(result.get()));
234 return; 235 return;
235 } 236 }
236 237
237 std::unique_ptr<base::DictionaryValue> result(BuildTargetDescriptor(rvh)); 238 std::unique_ptr<base::DictionaryValue> result(BuildTargetDescriptor(rvh));
238 auto web_contents = static_cast<WebContentsImpl*>( 239 auto web_contents = static_cast<WebContentsImpl*>(
239 WebContents::FromRenderViewHost(rvh)); 240 WebContents::FromRenderViewHost(rvh));
240 std::unique_ptr<AccessibilityTreeFormatter> formatter; 241 std::unique_ptr<AccessibilityTreeFormatter> formatter;
241 if (g_show_internal_accessibility_tree) 242 if (g_show_internal_accessibility_tree)
242 formatter.reset(new AccessibilityTreeFormatterBlink()); 243 formatter.reset(new AccessibilityTreeFormatterBlink());
243 else 244 else
244 formatter.reset(AccessibilityTreeFormatter::Create()); 245 formatter.reset(AccessibilityTreeFormatter::Create());
245 base::string16 accessibility_contents_utf16; 246 base::string16 accessibility_contents_utf16;
246 std::vector<AccessibilityTreeFormatter::Filter> filters; 247 std::vector<AccessibilityTreeFormatter::Filter> filters;
247 filters.push_back(AccessibilityTreeFormatter::Filter( 248 filters.push_back(AccessibilityTreeFormatter::Filter(
248 base::ASCIIToUTF16("*"), 249 base::ASCIIToUTF16("*"),
249 AccessibilityTreeFormatter::Filter::ALLOW)); 250 AccessibilityTreeFormatter::Filter::ALLOW));
250 formatter->SetFilters(filters); 251 formatter->SetFilters(filters);
251 formatter->FormatAccessibilityTree( 252 formatter->FormatAccessibilityTree(
252 web_contents->GetRootBrowserAccessibilityManager()->GetRoot(), 253 web_contents->GetRootBrowserAccessibilityManager()->GetRoot(),
253 &accessibility_contents_utf16); 254 &accessibility_contents_utf16);
254 result->Set("tree", 255 result->Set("tree",
255 new base::StringValue( 256 new base::StringValue(
256 base::UTF16ToUTF8(accessibility_contents_utf16))); 257 base::UTF16ToUTF8(accessibility_contents_utf16)));
257 web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get())); 258 web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree",
259 *(result.get()));
258 } 260 }
259 261
260 } // namespace content 262 } // namespace content
OLDNEW
« no previous file with comments | « components/proximity_auth/webui/proximity_auth_webui_handler.cc ('k') | content/browser/appcache/appcache_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698