Commit 68b05be4 authored by Artem Titov's avatar Artem Titov Committed by Commit Bot

Switch from temporary sigslot.h to the right one.

This CL switch only imported header file to unblock WebRTC refactoring
to move sigslot target to proper location. But it is required that
all usages of sigslot will be eliminated from chromium code base. Here
is a ticket to track this effort: https://crbug.com/867820

Bug: 867820, webrtc:8366
Change-Id: I431a178048886833b8bbd8508ce5a3937997f5ab
Reviewed-on: https://chromium-review.googlesource.com/1150537Reviewed-by: default avatarSergey Ulanov <sergeyu@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Reviewed-by: default avatarOlga Sharonova <olka@chromium.org>
Commit-Queue: Artem Titov <titovartem@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579340}
parent deb0c9c1
......@@ -754,6 +754,9 @@ target(link_target_type, "renderer") {
"//third_party/webrtc/pc:rtc_pc_base",
"//third_party/webrtc/rtc_base:rtc_base",
"//third_party/webrtc/rtc_base:rtc_task_queue",
# TODO(titovartem) remove dependency on WebRTC internals.
"//third_party/webrtc/rtc_base/third_party/sigslot:sigslot",
"//third_party/webrtc/stats",
"//third_party/webrtc/system_wrappers",
"//third_party/webrtc_overrides:init_webrtc",
......
......@@ -18,7 +18,7 @@
#include "content/renderer/p2p/network_list_observer.h"
#include "third_party/webrtc/p2p/stunprober/stunprober.h"
#include "third_party/webrtc/rtc_base/network.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
class PacketSocketFactory;
......
......@@ -10,7 +10,7 @@
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "third_party/webrtc/rtc_base/network.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
class IPAddress;
......
......@@ -12,7 +12,7 @@
#include "content/common/content_export.h"
#include "content/renderer/p2p/network_manager_uma.h"
#include "third_party/webrtc/rtc_base/network.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
#include "url/gurl.h"
namespace media {
......
......@@ -30,8 +30,8 @@
#include "net/url_request/url_request_context_getter.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/rtc_base/ipaddress.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace jingle_glue {
......
......@@ -12,7 +12,7 @@
#include "jingle/glue/task_pump.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace notifier {
......
......@@ -17,7 +17,7 @@
#include "net/traffic_annotation/network_traffic_annotation.h"
#include "net/url_request/url_request_context_getter.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace buzz {
class PreXmppAuth;
......
......@@ -21,8 +21,8 @@
// cricket::TransportChannel.
#include "third_party/webrtc/p2p/base/packettransportinterface.h"
#include "third_party/webrtc/rtc_base/asyncpacketsocket.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/socketaddress.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace remoting {
namespace protocol {
......
......@@ -20,7 +20,7 @@
// TODO(johan): Replace #include by forward declaration once proper inheritance
// is defined for rtc::PacketTransportInterface and cricket::TransportChannel.
#include "third_party/webrtc/p2p/base/packettransportinterface.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace cricket {
class Candidate;
......
......@@ -16,7 +16,7 @@
#include <string>
#include "third_party/libjingle_xmpp/task_runner/taskparent.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
/////////////////////////////////////////////////////////////////////
//
......
......@@ -17,7 +17,7 @@
#include "third_party/libjingle_xmpp/task_runner/taskparent.h"
#include "third_party/webrtc/rtc_base/checks.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
class Task;
......
......@@ -13,7 +13,7 @@
#include <string>
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
class SocketAddress;
......
......@@ -15,8 +15,8 @@
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "third_party/libjingle_xmpp/xmpp/xmpptask.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/p2p/client/httpportallocator.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace buzz {
......
......@@ -12,7 +12,7 @@
#define WEBRTC_LIBJINGLE_XMPP_PREXMPPAUTH_H_
#include "third_party/libjingle_xmpp/xmpp/saslhandler.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace rtc {
class SocketAddress;
......
......@@ -14,8 +14,8 @@
#include "third_party/libjingle_xmpp/xmpp/plainsaslhandler.h"
#include "third_party/libjingle_xmpp/xmpp/prexmppauth.h"
#include "third_party/libjingle_xmpp/xmpp/saslplainmechanism.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/stringutils.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
#include "third_party/webrtc_overrides/rtc_base/logging.h"
#include "xmpptask.h"
......
......@@ -19,7 +19,7 @@
#include "third_party/libjingle_xmpp/xmpp/xmppclientsettings.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "third_party/libjingle_xmpp/xmpp/xmpptask.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace buzz {
......
......@@ -19,7 +19,7 @@
#include "third_party/libjingle_xmpp/task_runner/taskparent.h"
#include "third_party/libjingle_xmpp/xmpp/xmppengine.h"
#include "third_party/webrtc/rtc_base/constructormagic.h"
#include "third_party/webrtc/rtc_base/sigslot.h"
#include "third_party/webrtc/rtc_base/third_party/sigslot/sigslot.h"
namespace buzz {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment