summaryrefslogtreecommitdiffstats
path: root/remoting/client
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-27 00:00:44 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-27 00:00:44 +0000
commitaa46ba58bd3935d7eaa952b7d37252b4057513e6 (patch)
treebf566756babde4533ced025df33149c7a15d14b5 /remoting/client
parent083237baa51586b9db720facb2c07914e22bb753 (diff)
downloadchromium_src-aa46ba58bd3935d7eaa952b7d37252b4057513e6.zip
chromium_src-aa46ba58bd3935d7eaa952b7d37252b4057513e6.tar.gz
chromium_src-aa46ba58bd3935d7eaa952b7d37252b4057513e6.tar.bz2
remoting: Remove use of ALLOW_THIS_IN_INITIALIZER_LIST.
It's no longer providing value as the MSVC warning is disabled during compilation. Refer to bug for details. BUG=234765 Review URL: https://chromiumcodereview.appspot.com/14522010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196888 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
-rw-r--r--remoting/client/chromoting_client.cc2
-rw-r--r--remoting/client/plugin/chromoting_instance.cc2
-rw-r--r--remoting/client/plugin/pepper_network_manager.cc2
-rw-r--r--remoting/client/plugin/pepper_packet_socket_factory.cc2
-rw-r--r--remoting/client/plugin/pepper_port_allocator.cc2
-rw-r--r--remoting/client/plugin/pepper_token_fetcher.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc
index 7f643dc..059baae 100644
--- a/remoting/client/chromoting_client.cc
+++ b/remoting/client/chromoting_client.cc
@@ -36,7 +36,7 @@ ChromotingClient::ChromotingClient(
connection_(connection),
user_interface_(user_interface),
host_capabilities_received_(false),
- weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ weak_factory_(this) {
rectangle_decoder_ =
new RectangleUpdateDecoder(client_context->main_task_runner(),
client_context->decode_task_runner(),
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index bc204ca..d60127e 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -182,7 +182,7 @@ ChromotingInstance::ChromotingInstance(PP_Instance pp_instance)
#endif
input_handler_(&key_mapper_),
use_async_pin_dialog_(false),
- weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
+ weak_factory_(this) {
RequestInputEvents(PP_INPUTEVENT_CLASS_MOUSE | PP_INPUTEVENT_CLASS_WHEEL);
RequestFilteringInputEvents(PP_INPUTEVENT_CLASS_KEYBOARD);
diff --git a/remoting/client/plugin/pepper_network_manager.cc b/remoting/client/plugin/pepper_network_manager.cc
index 1eaabc0..e03be2c 100644
--- a/remoting/client/plugin/pepper_network_manager.cc
+++ b/remoting/client/plugin/pepper_network_manager.cc
@@ -19,7 +19,7 @@ PepperNetworkManager::PepperNetworkManager(const pp::InstanceHandle& instance)
this),
start_count_(0),
network_list_received_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
PepperNetworkManager::~PepperNetworkManager() {
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc
index d7445c4..c83942d 100644
--- a/remoting/client/plugin/pepper_packet_socket_factory.cc
+++ b/remoting/client/plugin/pepper_packet_socket_factory.cc
@@ -110,7 +110,7 @@ UdpPacketSocket::UdpPacketSocket(const pp::InstanceHandle& instance)
max_port_(0),
send_pending_(false),
send_queue_size_(0),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
UdpPacketSocket::~UdpPacketSocket() {
diff --git a/remoting/client/plugin/pepper_port_allocator.cc b/remoting/client/plugin/pepper_port_allocator.cc
index 423102a..976371b 100644
--- a/remoting/client/plugin/pepper_port_allocator.cc
+++ b/remoting/client/plugin/pepper_port_allocator.cc
@@ -95,7 +95,7 @@ PepperPortAllocatorSession::PepperPortAllocatorSession(
stun_address_resolver_(instance_),
stun_port_(0),
relay_response_received_(false),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
if (stun_hosts.size() > 0) {
stun_address_ = stun_hosts[0];
}
diff --git a/remoting/client/plugin/pepper_token_fetcher.cc b/remoting/client/plugin/pepper_token_fetcher.cc
index 1127230..5f08fe9 100644
--- a/remoting/client/plugin/pepper_token_fetcher.cc
+++ b/remoting/client/plugin/pepper_token_fetcher.cc
@@ -12,7 +12,7 @@ PepperTokenFetcher::PepperTokenFetcher(base::WeakPtr<ChromotingInstance> plugin,
const std::string& host_public_key)
: plugin_(plugin),
host_public_key_(host_public_key),
- ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
+ weak_factory_(this) {
}
PepperTokenFetcher::~PepperTokenFetcher() {