| OLD | NEW |
| 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> |
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 std::vector<int32_t> child_ids; | 117 std::vector<int32_t> child_ids; |
| 118 | 118 |
| 119 // The object's location relative to its window or frame. | 119 // The object's location relative to its window or frame. |
| 120 gfx::Rect location; | 120 gfx::Rect location; |
| 121 | 121 |
| 122 // An additional transform to apply to position this object and its subtree. | 122 // An additional transform to apply to position this object and its subtree. |
| 123 // NOTE: this member is a scoped_ptr because it's rare and gfx::Transform | 123 // NOTE: this member is a scoped_ptr because it's rare and gfx::Transform |
| 124 // takes up a fair amount of space. The assignment operator and copy | 124 // takes up a fair amount of space. The assignment operator and copy |
| 125 // constructor both make a duplicate of the owned pointer, so it acts more | 125 // constructor both make a duplicate of the owned pointer, so it acts more |
| 126 // like a member than a pointer. | 126 // like a member than a pointer. |
| 127 scoped_ptr<gfx::Transform> transform; | 127 std::unique_ptr<gfx::Transform> transform; |
| 128 }; | 128 }; |
| 129 | 129 |
| 130 } // namespace ui | 130 } // namespace ui |
| 131 | 131 |
| 132 #endif // UI_ACCESSIBILITY_AX_NODE_DATA_H_ | 132 #endif // UI_ACCESSIBILITY_AX_NODE_DATA_H_ |
| OLD | NEW |