summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 18:05:41 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-21 18:05:41 +0000
commitc62dd9d42bd87964a131adc688d0c70f63cc4cac (patch)
treeb57f3bc0843d2acace088498ecb40e0bfc213b6c /remoting
parentb6bb36e2e8c9a09b4fd733bf74b60a6f02a5a7e9 (diff)
downloadchromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.zip
chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.tar.gz
chromium_src-c62dd9d42bd87964a131adc688d0c70f63cc4cac.tar.bz2
Delete Tracked, and move Location to its own file.
The Birth/Death tracking of tasks has been moved out-of-band into MessageLoop's PendingTask structure. Thus, Task no longer needs to inherit from Tracked. Since Task was the only child of Tracked, delete the Tracked class and move Location to its own file. BUG=none TEST=builds Review URL: http://codereview.chromium.org/7879006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102132 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/client/plugin/pepper_xmpp_proxy.cc1
-rw-r--r--remoting/host/json_host_config.cc3
-rw-r--r--remoting/host/plugin/policy_hack/nat_policy.cc4
-rw-r--r--remoting/protocol/buffered_socket_writer.cc3
-rw-r--r--remoting/protocol/connection_to_client.cc1
-rw-r--r--remoting/protocol/connection_to_host.cc1
-rw-r--r--remoting/protocol/input_sender.cc1
-rw-r--r--remoting/protocol/jingle_session.cc1
-rw-r--r--remoting/protocol/message_reader.cc1
9 files changed, 13 insertions, 3 deletions
diff --git a/remoting/client/plugin/pepper_xmpp_proxy.cc b/remoting/client/plugin/pepper_xmpp_proxy.cc
index 9400c0b7a..f167e6e 100644
--- a/remoting/client/plugin/pepper_xmpp_proxy.cc
+++ b/remoting/client/plugin/pepper_xmpp_proxy.cc
@@ -5,6 +5,7 @@
#include "remoting/client/plugin/pepper_xmpp_proxy.h"
#include "base/bind.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "remoting/client/plugin/chromoting_scriptable_object.h"
diff --git a/remoting/host/json_host_config.cc b/remoting/host/json_host_config.cc
index 36b39f2e..2d2c884 100644
--- a/remoting/host/json_host_config.cc
+++ b/remoting/host/json_host_config.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,6 +7,7 @@
#include "base/file_util.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "base/synchronization/lock.h"
#include "base/task.h"
diff --git a/remoting/host/plugin/policy_hack/nat_policy.cc b/remoting/host/plugin/policy_hack/nat_policy.cc
index c32ed37..df1a1dc 100644
--- a/remoting/host/plugin/policy_hack/nat_policy.cc
+++ b/remoting/host/plugin/policy_hack/nat_policy.cc
@@ -9,9 +9,11 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
-#include "base/message_loop_proxy.h"
+#include "base/location.h"
#include "base/memory/weak_ptr.h"
+#include "base/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
+#include "base/time.h"
#include "base/values.h"
namespace remoting {
diff --git a/remoting/protocol/buffered_socket_writer.cc b/remoting/protocol/buffered_socket_writer.cc
index d993a37..c89a50e 100644
--- a/remoting/protocol/buffered_socket_writer.cc
+++ b/remoting/protocol/buffered_socket_writer.cc
@@ -1,9 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "remoting/protocol/buffered_socket_writer.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "base/stl_util.h"
#include "net/base/net_errors.h"
diff --git a/remoting/protocol/connection_to_client.cc b/remoting/protocol/connection_to_client.cc
index f0cbc6a..c83e161 100644
--- a/remoting/protocol/connection_to_client.cc
+++ b/remoting/protocol/connection_to_client.cc
@@ -5,6 +5,7 @@
#include "remoting/protocol/connection_to_client.h"
#include "base/bind.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "google/protobuf/message.h"
#include "net/base/io_buffer.h"
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index 8452808..a816ac3 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "remoting/base/constants.h"
#include "remoting/jingle_glue/host_resolver.h"
diff --git a/remoting/protocol/input_sender.cc b/remoting/protocol/input_sender.cc
index 2d725c6..b02956a 100644
--- a/remoting/protocol/input_sender.cc
+++ b/remoting/protocol/input_sender.cc
@@ -8,6 +8,7 @@
#include "remoting/protocol/input_sender.h"
#include "base/task.h"
+#include "base/time.h"
#include "remoting/proto/event.pb.h"
#include "remoting/proto/internal.pb.h"
#include "remoting/protocol/buffered_socket_writer.h"
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc
index 4f7f83f..01ea806 100644
--- a/remoting/protocol/jingle_session.cc
+++ b/remoting/protocol/jingle_session.cc
@@ -5,6 +5,7 @@
#include "remoting/protocol/jingle_session.h"
#include "base/bind.h"
+#include "base/location.h"
#include "base/message_loop_proxy.h"
#include "base/rand_util.h"
#include "base/stl_util.h"
diff --git a/remoting/protocol/message_reader.cc b/remoting/protocol/message_reader.cc
index be9c455..f2902e0 100644
--- a/remoting/protocol/message_reader.cc
+++ b/remoting/protocol/message_reader.cc
@@ -6,6 +6,7 @@
#include "base/bind.h"
#include "base/callback.h"
+#include "base/location.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/socket/socket.h"