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

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

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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) 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 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 RenderWidgetHostViewPort* host_view = static_cast<RenderWidgetHostViewPort*>( 226 RenderWidgetHostViewPort* host_view = static_cast<RenderWidgetHostViewPort*>(
227 WebContents::FromRenderViewHost(rvh)->GetRenderWidgetHostView()); 227 WebContents::FromRenderViewHost(rvh)->GetRenderWidgetHostView());
228 if (!host_view) { 228 if (!host_view) {
229 result->Set("error", 229 result->Set("error",
230 new base::StringValue("Could not get accessibility tree.")); 230 new base::StringValue("Could not get accessibility tree."));
231 web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get())); 231 web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get()));
232 return; 232 return;
233 } 233 }
234 scoped_ptr<AccessibilityTreeFormatter> formatter( 234 scoped_ptr<AccessibilityTreeFormatter> formatter(
235 AccessibilityTreeFormatter::Create(rvh)); 235 AccessibilityTreeFormatter::Create(rvh));
236 string16 accessibility_contents_utf16; 236 base::string16 accessibility_contents_utf16;
237 BrowserAccessibilityManager* manager = 237 BrowserAccessibilityManager* manager =
238 host_view->GetBrowserAccessibilityManager(); 238 host_view->GetBrowserAccessibilityManager();
239 if (!manager) { 239 if (!manager) {
240 result->Set("error", 240 result->Set("error",
241 new base::StringValue("Could not get accessibility tree.")); 241 new base::StringValue("Could not get accessibility tree."));
242 web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get())); 242 web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get()));
243 return; 243 return;
244 } 244 }
245 std::vector<AccessibilityTreeFormatter::Filter> filters; 245 std::vector<AccessibilityTreeFormatter::Filter> filters;
246 filters.push_back(AccessibilityTreeFormatter::Filter( 246 filters.push_back(AccessibilityTreeFormatter::Filter(
247 ASCIIToUTF16("*"), 247 ASCIIToUTF16("*"),
248 AccessibilityTreeFormatter::Filter::ALLOW)); 248 AccessibilityTreeFormatter::Filter::ALLOW));
249 formatter->SetFilters(filters); 249 formatter->SetFilters(filters);
250 formatter->FormatAccessibilityTree(&accessibility_contents_utf16); 250 formatter->FormatAccessibilityTree(&accessibility_contents_utf16);
251 251
252 result->Set("tree", 252 result->Set("tree",
253 new base::StringValue(UTF16ToUTF8(accessibility_contents_utf16))); 253 new base::StringValue(UTF16ToUTF8(accessibility_contents_utf16)));
254 web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get())); 254 web_ui()->CallJavascriptFunction("accessibility.showTree", *(result.get()));
255 } 255 }
256 256
257 } // namespace content 257 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698