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

Side by Side Diff: ui/accessibility/ax_node_data.h

Issue 1917053003: unique_ptr_migration: clean up references to scoped_ptr as of r389721 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 7 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 | « sandbox/win/src/address_sanitizer_test.cc ('k') | ui/android/window_android_compositor.h » ('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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #ifndef UI_ACCESSIBILITY_AX_NODE_DATA_H_ 5 #ifndef UI_ACCESSIBILITY_AX_NODE_DATA_H_
6 #define UI_ACCESSIBILITY_AX_NODE_DATA_H_ 6 #define UI_ACCESSIBILITY_AX_NODE_DATA_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory>
11 #include <string> 12 #include <string>
12 #include <vector> 13 #include <vector>
13 14
14 #include "base/memory/scoped_ptr.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/strings/string_split.h" 16 #include "base/strings/string_split.h"
17 #include "ui/accessibility/ax_enums.h" 17 #include "ui/accessibility/ax_enums.h"
18 #include "ui/accessibility/ax_export.h" 18 #include "ui/accessibility/ax_export.h"
19 #include "ui/gfx/geometry/rect.h" 19 #include "ui/gfx/geometry/rect.h"
20 20
21 namespace gfx { 21 namespace gfx {
22 class Transform; 22 class Transform;
23 }; 23 };
24 24
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 std::vector<std::pair<AXBoolAttribute, bool> > bool_attributes; 110 std::vector<std::pair<AXBoolAttribute, bool> > bool_attributes;
111 std::vector<std::pair<AXIntListAttribute, std::vector<int32_t>>> 111 std::vector<std::pair<AXIntListAttribute, std::vector<int32_t>>>
112 intlist_attributes; 112 intlist_attributes;
113 base::StringPairs html_attributes; 113 base::StringPairs html_attributes;
114 std::vector<int32_t> child_ids; 114 std::vector<int32_t> child_ids;
115 115
116 // The object's location relative to its window or frame. 116 // The object's location relative to its window or frame.
117 gfx::Rect location; 117 gfx::Rect location;
118 118
119 // An additional transform to apply to position this object and its subtree. 119 // An additional transform to apply to position this object and its subtree.
120 // NOTE: this member is a scoped_ptr because it's rare and gfx::Transform 120 // NOTE: this member is a std::unique_ptr because it's rare and gfx::Transform
121 // takes up a fair amount of space. The assignment operator and copy 121 // takes up a fair amount of space. The assignment operator and copy
122 // constructor both make a duplicate of the owned pointer, so it acts more 122 // constructor both make a duplicate of the owned pointer, so it acts more
123 // like a member than a pointer. 123 // like a member than a pointer.
124 std::unique_ptr<gfx::Transform> transform; 124 std::unique_ptr<gfx::Transform> transform;
125 }; 125 };
126 126
127 } // namespace ui 127 } // namespace ui
128 128
129 #endif // UI_ACCESSIBILITY_AX_NODE_DATA_H_ 129 #endif // UI_ACCESSIBILITY_AX_NODE_DATA_H_
OLDNEW
« no previous file with comments | « sandbox/win/src/address_sanitizer_test.cc ('k') | ui/android/window_android_compositor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698