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

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

Issue 2101943004: content: Change auto to not deduce raw pointers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase/update Created 4 years, 5 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
« no previous file with comments | « no previous file | content/browser/accessibility/browser_accessibility.cc » ('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) 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 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 int route_id; 181 int route_id;
182 CHECK_EQ(2U, args->GetSize()); 182 CHECK_EQ(2U, args->GetSize());
183 CHECK(args->GetString(0, &process_id_str)); 183 CHECK(args->GetString(0, &process_id_str));
184 CHECK(args->GetString(1, &route_id_str)); 184 CHECK(args->GetString(1, &route_id_str));
185 CHECK(base::StringToInt(process_id_str, &process_id)); 185 CHECK(base::StringToInt(process_id_str, &process_id));
186 CHECK(base::StringToInt(route_id_str, &route_id)); 186 CHECK(base::StringToInt(route_id_str, &route_id));
187 187
188 RenderViewHost* rvh = RenderViewHost::FromID(process_id, route_id); 188 RenderViewHost* rvh = RenderViewHost::FromID(process_id, route_id);
189 if (!rvh) 189 if (!rvh)
190 return; 190 return;
191 auto web_contents = static_cast<WebContentsImpl*>( 191 auto* web_contents =
192 WebContents::FromRenderViewHost(rvh)); 192 static_cast<WebContentsImpl*>(WebContents::FromRenderViewHost(rvh));
193 AccessibilityMode mode = web_contents->GetAccessibilityMode(); 193 AccessibilityMode mode = web_contents->GetAccessibilityMode();
194 if ((mode & AccessibilityModeComplete) != AccessibilityModeComplete) { 194 if ((mode & AccessibilityModeComplete) != AccessibilityModeComplete) {
195 web_contents->AddAccessibilityMode(AccessibilityModeComplete); 195 web_contents->AddAccessibilityMode(AccessibilityModeComplete);
196 } else { 196 } else {
197 web_contents->SetAccessibilityMode( 197 web_contents->SetAccessibilityMode(
198 BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode()); 198 BrowserAccessibilityStateImpl::GetInstance()->accessibility_mode());
199 } 199 }
200 } 200 }
201 201
202 void AccessibilityUI::ToggleGlobalAccessibility(const base::ListValue* args) { 202 void AccessibilityUI::ToggleGlobalAccessibility(const base::ListValue* args) {
(...skipping 26 matching lines...) Expand all
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()->CallJavascriptFunctionUnsafe("accessibility.showTree", 233 web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree",
234 *(result.get())); 234 *(result.get()));
235 return; 235 return;
236 } 236 }
237 237
238 std::unique_ptr<base::DictionaryValue> result(BuildTargetDescriptor(rvh)); 238 std::unique_ptr<base::DictionaryValue> result(BuildTargetDescriptor(rvh));
239 auto web_contents = static_cast<WebContentsImpl*>( 239 auto* web_contents =
240 WebContents::FromRenderViewHost(rvh)); 240 static_cast<WebContentsImpl*>(WebContents::FromRenderViewHost(rvh));
241 std::unique_ptr<AccessibilityTreeFormatter> formatter; 241 std::unique_ptr<AccessibilityTreeFormatter> formatter;
242 if (g_show_internal_accessibility_tree) 242 if (g_show_internal_accessibility_tree)
243 formatter.reset(new AccessibilityTreeFormatterBlink()); 243 formatter.reset(new AccessibilityTreeFormatterBlink());
244 else 244 else
245 formatter.reset(AccessibilityTreeFormatter::Create()); 245 formatter.reset(AccessibilityTreeFormatter::Create());
246 base::string16 accessibility_contents_utf16; 246 base::string16 accessibility_contents_utf16;
247 std::vector<AccessibilityTreeFormatter::Filter> filters; 247 std::vector<AccessibilityTreeFormatter::Filter> filters;
248 filters.push_back(AccessibilityTreeFormatter::Filter( 248 filters.push_back(AccessibilityTreeFormatter::Filter(
249 base::ASCIIToUTF16("*"), 249 base::ASCIIToUTF16("*"),
250 AccessibilityTreeFormatter::Filter::ALLOW)); 250 AccessibilityTreeFormatter::Filter::ALLOW));
251 formatter->SetFilters(filters); 251 formatter->SetFilters(filters);
252 formatter->FormatAccessibilityTree( 252 formatter->FormatAccessibilityTree(
253 web_contents->GetRootBrowserAccessibilityManager()->GetRoot(), 253 web_contents->GetRootBrowserAccessibilityManager()->GetRoot(),
254 &accessibility_contents_utf16); 254 &accessibility_contents_utf16);
255 result->Set("tree", 255 result->Set("tree",
256 new base::StringValue( 256 new base::StringValue(
257 base::UTF16ToUTF8(accessibility_contents_utf16))); 257 base::UTF16ToUTF8(accessibility_contents_utf16)));
258 web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree", 258 web_ui()->CallJavascriptFunctionUnsafe("accessibility.showTree",
259 *(result.get())); 259 *(result.get()));
260 } 260 }
261 261
262 } // namespace content 262 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/accessibility/browser_accessibility.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698