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

Side by Side Diff: content/browser/accessibility/accessibility_tree_formatter_mac.mm

Issue 642313003: [C++11 Allowed Features] Declares a type-safe null pointer converting from NULL to nullptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Including id in the AUTHORS file. Created 6 years, 2 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) 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 "content/browser/accessibility/accessibility_tree_formatter.h" 5 #include "content/browser/accessibility/accessibility_tree_formatter.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 std::string json_value; 255 std::string json_value;
256 base::JSONWriter::Write(value, &json_value); 256 base::JSONWriter::Write(value, &json_value);
257 WriteAttribute( 257 WriteAttribute(
258 [defaultAttributes containsObject:requestedAttribute], 258 [defaultAttributes containsObject:requestedAttribute],
259 StringPrintf("%s=%s", 259 StringPrintf("%s=%s",
260 requestedAttributeUTF8.c_str(), 260 requestedAttributeUTF8.c_str(),
261 json_value.c_str()), 261 json_value.c_str()),
262 &line); 262 &line);
263 } 263 }
264 } 264 }
265 const base::DictionaryValue* d_value = NULL; 265 const base::DictionaryValue* d_value = nullptr;
266 if (dict.GetDictionary(kPositionDictAttr, &d_value)) { 266 if (dict.GetDictionary(kPositionDictAttr, &d_value)) {
267 WriteAttribute(false, 267 WriteAttribute(false,
268 FormatCoordinates(kPositionDictAttr, 268 FormatCoordinates(kPositionDictAttr,
269 kXCoordDictAttr, kYCoordDictAttr, 269 kXCoordDictAttr, kYCoordDictAttr,
270 *d_value), 270 *d_value),
271 &line); 271 &line);
272 } 272 }
273 if (dict.GetDictionary(kSizeDictAttr, &d_value)) { 273 if (dict.GetDictionary(kSizeDictAttr, &d_value)) {
274 WriteAttribute(false, 274 WriteAttribute(false,
275 FormatCoordinates(kSizeDictAttr, 275 FormatCoordinates(kSizeDictAttr,
(...skipping 25 matching lines...) Expand all
301 const string AccessibilityTreeFormatter::GetAllowString() { 301 const string AccessibilityTreeFormatter::GetAllowString() {
302 return "@MAC-ALLOW:"; 302 return "@MAC-ALLOW:";
303 } 303 }
304 304
305 // static 305 // static
306 const string AccessibilityTreeFormatter::GetDenyString() { 306 const string AccessibilityTreeFormatter::GetDenyString() {
307 return "@MAC-DENY:"; 307 return "@MAC-DENY:";
308 } 308 }
309 309
310 } // namespace content 310 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698