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

Side by Side Diff: ui/views/accessibility/native_view_accessibility_mac.mm

Issue 2718073003: Views a11y: Convert View's NativeViewAccessibility to a unique_ptr. (Closed)
Patch Set: Fix long lived NVA in test. Created 3 years, 9 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "ui/views/accessibility/native_view_accessibility_mac.h" 5 #include "ui/views/accessibility/native_view_accessibility_mac.h"
6 6
7 #include <memory>
8
9 #include "base/memory/ptr_util.h"
7 #include "ui/views/view.h" 10 #include "ui/views/view.h"
8 #include "ui/views/widget/widget.h" 11 #include "ui/views/widget/widget.h"
9 12
10 namespace views { 13 namespace views {
11 14
12 // static 15 // static
13 NativeViewAccessibility* NativeViewAccessibility::Create(View* view) { 16 std::unique_ptr<NativeViewAccessibility> NativeViewAccessibility::Create(
14 return new NativeViewAccessibilityMac(view); 17 View* view) {
18 return base::MakeUnique<NativeViewAccessibilityMac>(view);
15 } 19 }
16 20
17 NativeViewAccessibilityMac::NativeViewAccessibilityMac(View* view) 21 NativeViewAccessibilityMac::NativeViewAccessibilityMac(View* view)
18 : NativeViewAccessibility(view) {} 22 : NativeViewAccessibility(view) {}
19 23
20 gfx::NativeViewAccessible NativeViewAccessibilityMac::GetParent() { 24 gfx::NativeViewAccessible NativeViewAccessibilityMac::GetParent() {
21 if (view_->parent()) 25 if (view_->parent())
22 return view_->parent()->GetNativeViewAccessible(); 26 return view_->parent()->GetNativeViewAccessible();
23 27
24 if (view_->GetWidget()) 28 if (view_->GetWidget())
25 return view_->GetWidget()->GetNativeView(); 29 return view_->GetWidget()->GetNativeView();
26 30
27 if (parent_widget_) 31 if (parent_widget_)
28 return parent_widget_->GetRootView()->GetNativeViewAccessible(); 32 return parent_widget_->GetRootView()->GetNativeViewAccessible();
29 33
30 return nullptr; 34 return nullptr;
31 } 35 }
32 36
33 } // namespace views 37 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698