Index: extensions/browser/guest_view/web_view/web_view_find_helper.h |
diff --git a/extensions/browser/guest_view/web_view/web_view_find_helper.h b/extensions/browser/guest_view/web_view/web_view_find_helper.h |
index 0c622d0c089d1360048ec3184ad0bb8f7e95881d..3c2245d740a820749cb01c789547d65705b904b3 100644 |
--- a/extensions/browser/guest_view/web_view/web_view_find_helper.h |
+++ b/extensions/browser/guest_view/web_view/web_view_find_helper.h |
@@ -9,6 +9,7 @@ |
#include <vector> |
#include "base/macros.h" |
+#include "base/memory/scoped_ptr.h" |
#include "base/memory/weak_ptr.h" |
#include "base/values.h" |
#include "content/public/browser/web_contents.h" |
@@ -172,12 +173,13 @@ class WebViewFindHelper { |
// Stores aggregated find results and other info for the |findupdate| event. |
scoped_ptr<FindUpdateEvent> find_update_event_; |
- // Pointer to the first request of the current find session. |
- linked_ptr<FindInfo> current_find_session_; |
+ // Pointer to the first request of the current find session. find_info_map_ |
+ // retains ownership. |
+ base::WeakPtr<FindInfo> current_find_session_; |
dcheng
2016/01/27 22:18:27
An alternative is to make this a raw pointer, but
|
// Stores each find request's information by request_id so that its callback |
// function can be called when its find results are available. |
- typedef std::map<int, linked_ptr<FindInfo> > FindInfoMap; |
+ using FindInfoMap = std::map<int, scoped_ptr<FindInfo>>; |
FindInfoMap find_info_map_; |
DISALLOW_COPY_AND_ASSIGN(WebViewFindHelper); |