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

Unified Diff: extensions/browser/guest_view/web_view/web_view_find_helper.cc

Issue 1641563002: Remove linked_ptr usage in //base. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: extensions/browser/guest_view/web_view/web_view_find_helper.cc
diff --git a/extensions/browser/guest_view/web_view/web_view_find_helper.cc b/extensions/browser/guest_view/web_view/web_view_find_helper.cc
index 725326a8cbd28e3f9fb47fd24ba21fc8a2e65dcd..48309aef86aa9bbb3f0b21de80dd438d77da1c06 100644
--- a/extensions/browser/guest_view/web_view/web_view_find_helper.cc
+++ b/extensions/browser/guest_view/web_view/web_view_find_helper.cc
@@ -22,12 +22,11 @@ WebViewFindHelper::~WebViewFindHelper() {
}
void WebViewFindHelper::CancelAllFindSessions() {
- current_find_session_ = linked_ptr<WebViewFindHelper::FindInfo>();
while (!find_info_map_.empty()) {
find_info_map_.begin()->second->SendResponse(true /* canceled */);
find_info_map_.erase(find_info_map_.begin());
}
- if (find_update_event_.get())
+ if (find_update_event_)
DispatchFindUpdateEvent(true /* canceled */, true /* final_update */);
find_update_event_.reset();
}
@@ -100,8 +99,7 @@ void WebViewFindHelper::Find(
std::pair<FindInfoMap::iterator, bool> insert_result =
find_info_map_.insert(std::make_pair(
current_find_request_id_,
- linked_ptr<
- WebViewFindHelper::FindInfo>(new WebViewFindHelper::FindInfo(
+ make_scoped_ptr(new WebViewFindHelper::FindInfo(
current_find_request_id_, search_text, options, find_function))));
// No duplicate insertions.
DCHECK(insert_result.second);
@@ -110,7 +108,7 @@ void WebViewFindHelper::Find(
blink::WebFindOptions* full_options = insert_result.first->second->options();
// Set |findNext| implicitly.
- if (current_find_session_.get()) {
+ if (current_find_session_) {
const base::string16& current_search_text =
current_find_session_->search_text();
bool current_match_case = current_find_session_->options()->matchCase;
@@ -122,7 +120,7 @@ void WebViewFindHelper::Find(
}
// Link find requests that are a part of the same find session.
- if (full_options->findNext && current_find_session_.get()) {
+ if (full_options->findNext && current_find_session_) {
DCHECK(current_find_request_id_ != current_find_session_->request_id());
current_find_session_->AddFindNextRequest(
insert_result.first->second->AsWeakPtr());
@@ -130,7 +128,7 @@ void WebViewFindHelper::Find(
// Update the current find session, if necessary.
if (!full_options->findNext)
- current_find_session_ = insert_result.first->second;
+ current_find_session_ = insert_result.first->second->AsWeakPtr();
// Handle the empty |search_text| case internally.
if (search_text.empty()) {
@@ -155,7 +153,7 @@ void WebViewFindHelper::FindReply(int request_id,
return;
// This find request must be a part of an existing find session.
- DCHECK(current_find_session_.get());
+ DCHECK(current_find_session_);
WebViewFindHelper::FindInfo* find_info = find_iterator->second.get();

Powered by Google App Engine
This is Rietveld 408576698