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

Unified Diff: chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc

Issue 2767893002: Remove ScopedVector from chrome/browser/. (Closed)
Patch Set: Address comments from zea@ Created 3 years, 9 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: chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc
diff --git a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc
index 9bd20a72f6cb1dcc95c17b5be32f62c820010d42..788cb76567dfccc2741f33bb6bab23144775e8a4 100644
--- a/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc
+++ b/chrome/browser/speech/chrome_speech_recognition_manager_delegate.cc
@@ -4,11 +4,14 @@
#include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
+#include <memory>
#include <set>
#include <string>
+#include <vector>
#include "base/bind.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_restrictions.h"
@@ -105,16 +108,16 @@ class ChromeSpeechRecognitionManagerDelegate::TabWatcher
if (FindWebContents(web_contents) != registered_web_contents_.end())
return;
- registered_web_contents_.push_back(new WebContentsTracker(
- web_contents, base::Bind(&TabWatcher::OnTabClosed,
- // |this| outlives WebContentsTracker.
- base::Unretained(this), web_contents),
+ registered_web_contents_.push_back(base::MakeUnique<WebContentsTracker>(
+ web_contents,
+ base::Bind(&TabWatcher::OnTabClosed,
+ // |this| outlives WebContentsTracker.
+ base::Unretained(this), web_contents),
render_process_id, render_view_id));
}
void OnTabClosed(content::WebContents* web_contents) {
- ScopedVector<WebContentsTracker>::iterator iter =
- FindWebContents(web_contents);
+ auto iter = FindWebContents(web_contents);
DCHECK(iter != registered_web_contents_.end());
int render_process_id = (*iter)->render_process_id();
int render_view_id = (*iter)->render_view_id();
@@ -178,10 +181,9 @@ class ChromeSpeechRecognitionManagerDelegate::TabWatcher
// Helper function to find the iterator in |registered_web_contents_| which
// contains |web_contents|.
- ScopedVector<WebContentsTracker>::iterator FindWebContents(
+ std::vector<std::unique_ptr<WebContentsTracker>>::iterator FindWebContents(
content::WebContents* web_contents) {
- for (ScopedVector<WebContentsTracker>::iterator i(
- registered_web_contents_.begin());
+ for (auto i = registered_web_contents_.begin();
i != registered_web_contents_.end(); ++i) {
if ((*i)->GetWebContents() == web_contents)
return i;
@@ -194,7 +196,7 @@ class ChromeSpeechRecognitionManagerDelegate::TabWatcher
// double registrations on WebContentsObserver and to pass the correct render
// process id and render view id to |tab_closed_callback_| after the process
// has gone away.
- ScopedVector<WebContentsTracker> registered_web_contents_;
+ std::vector<std::unique_ptr<WebContentsTracker>> registered_web_contents_;
// Callback used to notify, on the thread specified by |callback_thread_| the
// closure of a registered tab.

Powered by Google App Engine
This is Rietveld 408576698