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

Unified Diff: remoting/host/host_extension_session_manager.cc

Issue 2627433003: Remove ScopedVector from remoting/. (Closed)
Patch Set: rev Created 3 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
« no previous file with comments | « remoting/host/host_extension_session_manager.h ('k') | remoting/protocol/audio_pump_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/host_extension_session_manager.cc
diff --git a/remoting/host/host_extension_session_manager.cc b/remoting/host/host_extension_session_manager.cc
index 8940cb66bb879ebf9d5f9eeaddda01c97aea9297..ac06b4fc20b505bee51ab43d6ee3f0bc12caeffe 100644
--- a/remoting/host/host_extension_session_manager.cc
+++ b/remoting/host/host_extension_session_manager.cc
@@ -4,6 +4,7 @@
#include "remoting/host/host_extension_session_manager.h"
+#include "base/logging.h"
#include "remoting/base/capabilities.h"
#include "remoting/host/client_session_details.h"
#include "remoting/host/host_extension.h"
@@ -12,7 +13,7 @@
namespace remoting {
HostExtensionSessionManager::HostExtensionSessionManager(
- const std::vector<HostExtension*>& extensions,
+ const HostExtensions& extensions,
ClientSessionDetails* client_session_details)
: client_session_details_(client_session_details),
client_stub_(nullptr),
@@ -22,9 +23,8 @@ HostExtensionSessionManager::~HostExtensionSessionManager() {}
std::string HostExtensionSessionManager::GetCapabilities() const {
std::string capabilities;
- for (HostExtensions::const_iterator extension = extensions_.begin();
- extension != extensions_.end(); ++extension) {
- const std::string& capability = (*extension)->capability();
+ for (const auto& extension : extensions_) {
+ const std::string& capability = extension->capability();
if (capability.empty()) {
continue;
}
@@ -44,30 +44,28 @@ void HostExtensionSessionManager::OnNegotiatedCapabilities(
client_stub_ = client_stub;
- for (HostExtensions::const_iterator extension = extensions_.begin();
- extension != extensions_.end(); ++extension) {
+ for (const auto& extension : extensions_) {
// If the extension requires a capability that was not negotiated then do
// not instantiate it.
- if (!(*extension)->capability().empty() &&
- !HasCapability(capabilities, (*extension)->capability())) {
+ if (!extension->capability().empty() &&
+ !HasCapability(capabilities, extension->capability())) {
continue;
}
std::unique_ptr<HostExtensionSession> extension_session =
- (*extension)
- ->CreateExtensionSession(client_session_details_, client_stub_);
+ extension->CreateExtensionSession(client_session_details_,
+ client_stub_);
DCHECK(extension_session);
- extension_sessions_.push_back(extension_session.release());
+ extension_sessions_.push_back(std::move(extension_session));
}
}
bool HostExtensionSessionManager::OnExtensionMessage(
const protocol::ExtensionMessage& message) {
- for(HostExtensionSessions::const_iterator it = extension_sessions_.begin();
- it != extension_sessions_.end(); ++it) {
- if ((*it)->OnExtensionMessage(client_session_details_, client_stub_,
- message)) {
+ for (const auto& session : extension_sessions_) {
+ if (session->OnExtensionMessage(client_session_details_, client_stub_,
+ message)) {
return true;
}
}
« no previous file with comments | « remoting/host/host_extension_session_manager.h ('k') | remoting/protocol/audio_pump_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698