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

Side by Side Diff: content/browser/accessibility/browser_accessibility_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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #import "content/browser/accessibility/browser_accessibility_mac.h" 7 #import "content/browser/accessibility/browser_accessibility_mac.h"
8 8
9 #import "content/browser/accessibility/browser_accessibility_cocoa.h" 9 #import "content/browser/accessibility/browser_accessibility_cocoa.h"
10 #include "content/browser/accessibility/browser_accessibility_manager_mac.h" 10 #include "content/browser/accessibility/browser_accessibility_manager_mac.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 // Static. 14 // Static.
15 BrowserAccessibility* BrowserAccessibility::Create() { 15 BrowserAccessibility* BrowserAccessibility::Create() {
16 return new BrowserAccessibilityMac(); 16 return new BrowserAccessibilityMac();
17 } 17 }
18 18
19 BrowserAccessibilityMac::BrowserAccessibilityMac() 19 BrowserAccessibilityMac::BrowserAccessibilityMac()
20 : browser_accessibility_cocoa_(NULL) { 20 : browser_accessibility_cocoa_(nullptr) {
21 } 21 }
22 22
23 void BrowserAccessibilityMac::OnDataChanged() { 23 void BrowserAccessibilityMac::OnDataChanged() {
24 BrowserAccessibility::OnDataChanged(); 24 BrowserAccessibility::OnDataChanged();
25 25
26 if (browser_accessibility_cocoa_) { 26 if (browser_accessibility_cocoa_) {
27 [browser_accessibility_cocoa_ childrenChanged]; 27 [browser_accessibility_cocoa_ childrenChanged];
28 return; 28 return;
29 } 29 }
30 30
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 initWithObject:this]; 62 initWithObject:this];
63 [browser_accessibility_cocoa_ swapChildren:&children]; 63 [browser_accessibility_cocoa_ swapChildren:&children];
64 } 64 }
65 65
66 BrowserAccessibilityCocoa* BrowserAccessibility::ToBrowserAccessibilityCocoa() { 66 BrowserAccessibilityCocoa* BrowserAccessibility::ToBrowserAccessibilityCocoa() {
67 return static_cast<BrowserAccessibilityMac*>(this)-> 67 return static_cast<BrowserAccessibilityMac*>(this)->
68 native_view(); 68 native_view();
69 } 69 }
70 70
71 } // namespace content 71 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698