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

Side by Side Diff: content/renderer/media/mock_data_channel_impl.h

Issue 1346883003: Added some missing includes, removed one include and removed an undef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_media_stream_video_track_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h"
10 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h " 11 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h "
11 12
12 namespace content { 13 namespace content {
13 14
14 class MockDataChannel : public webrtc::DataChannelInterface { 15 class MockDataChannel : public webrtc::DataChannelInterface {
15 public: 16 public:
16 MockDataChannel(const std::string& label, 17 MockDataChannel(const std::string& label,
17 const webrtc::DataChannelInit* config); 18 const webrtc::DataChannelInit* config);
18 19
19 void RegisterObserver(webrtc::DataChannelObserver* observer) override; 20 void RegisterObserver(webrtc::DataChannelObserver* observer) override;
(...skipping 23 matching lines...) Expand all
43 webrtc::DataChannelInterface::DataState state_; 44 webrtc::DataChannelInterface::DataState state_;
44 webrtc::DataChannelInit config_; 45 webrtc::DataChannelInit config_;
45 webrtc::DataChannelObserver* observer_; 46 webrtc::DataChannelObserver* observer_;
46 47
47 DISALLOW_COPY_AND_ASSIGN(MockDataChannel); 48 DISALLOW_COPY_AND_ASSIGN(MockDataChannel);
48 }; 49 };
49 50
50 } // namespace content 51 } // namespace content
51 52
52 #endif // CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_ 53 #endif // CONTENT_RENDERER_MEDIA_MOCK_DATA_CHANNEL_IMPL_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/pepper/pepper_media_stream_video_track_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698