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

Side by Side Diff: content/browser/accessibility/browser_accessibility_win.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ 5 #ifndef CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
6 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ 6 #define CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
7 7
8 #include <atlbase.h> 8 #include <atlbase.h>
9 #include <atlcom.h> 9 #include <atlcom.h>
10 #include <oleacc.h> 10 #include <oleacc.h>
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 916
917 // Maps the |hypertext_| embedded character offset to an index in 917 // Maps the |hypertext_| embedded character offset to an index in
918 // |hyperlinks_|. 918 // |hyperlinks_|.
919 std::map<int32_t, int32_t> hyperlink_offset_to_index; 919 std::map<int32_t, int32_t> hyperlink_offset_to_index;
920 920
921 // The id of a BrowserAccessibilityWin for each hyperlink. 921 // The id of a BrowserAccessibilityWin for each hyperlink.
922 // TODO(nektar): Replace object IDs with child indices. 922 // TODO(nektar): Replace object IDs with child indices.
923 std::vector<int32_t> hyperlinks; 923 std::vector<int32_t> hyperlinks;
924 }; 924 };
925 925
926 scoped_ptr<WinAttributes> win_attributes_; 926 std::unique_ptr<WinAttributes> win_attributes_;
927 927
928 // Only valid during the scope of a IA2_EVENT_TEXT_REMOVED or 928 // Only valid during the scope of a IA2_EVENT_TEXT_REMOVED or
929 // IA2_EVENT_TEXT_INSERTED event. 929 // IA2_EVENT_TEXT_INSERTED event.
930 scoped_ptr<WinAttributes> old_win_attributes_; 930 std::unique_ptr<WinAttributes> old_win_attributes_;
931 931
932 // Relationships between this node and other nodes. 932 // Relationships between this node and other nodes.
933 std::vector<BrowserAccessibilityRelation*> relations_; 933 std::vector<BrowserAccessibilityRelation*> relations_;
934 934
935 // The previous scroll position, so we can tell if this object scrolled. 935 // The previous scroll position, so we can tell if this object scrolled.
936 int previous_scroll_x_; 936 int previous_scroll_x_;
937 int previous_scroll_y_; 937 int previous_scroll_y_;
938 938
939 // Give BrowserAccessibility::Create access to our constructor. 939 // Give BrowserAccessibility::Create access to our constructor.
940 friend class BrowserAccessibility; 940 friend class BrowserAccessibility;
941 friend class BrowserAccessibilityRelation; 941 friend class BrowserAccessibilityRelation;
942 942
943 DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin); 943 DISALLOW_COPY_AND_ASSIGN(BrowserAccessibilityWin);
944 }; 944 };
945 945
946 CONTENT_EXPORT BrowserAccessibilityWin* 946 CONTENT_EXPORT BrowserAccessibilityWin*
947 ToBrowserAccessibilityWin(BrowserAccessibility* obj); 947 ToBrowserAccessibilityWin(BrowserAccessibility* obj);
948 948
949 CONTENT_EXPORT const BrowserAccessibilityWin* 949 CONTENT_EXPORT const BrowserAccessibilityWin*
950 ToBrowserAccessibilityWin(const BrowserAccessibility* obj); 950 ToBrowserAccessibilityWin(const BrowserAccessibility* obj);
951 951
952 } // namespace content 952 } // namespace content
953 953
954 #endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_ 954 #endif // CONTENT_BROWSER_ACCESSIBILITY_BROWSER_ACCESSIBILITY_WIN_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698