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

Side by Side Diff: content/common/media/media_stream_options.cc

Issue 2420903002: Bug Fix: Initialize |disable_local_echo| (Closed)
Patch Set: Created 4 years, 2 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 | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/common/media/media_stream_options.h" 5 #include "content/common/media/media_stream_options.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 const char kMediaStreamSourceTab[] = "tab"; 11 const char kMediaStreamSourceTab[] = "tab";
12 const char kMediaStreamSourceScreen[] = "screen"; 12 const char kMediaStreamSourceScreen[] = "screen";
13 const char kMediaStreamSourceDesktop[] = "desktop"; 13 const char kMediaStreamSourceDesktop[] = "desktop";
14 const char kMediaStreamSourceSystem[] = "system"; 14 const char kMediaStreamSourceSystem[] = "system";
15 15
16 TrackControls::TrackControls() 16 TrackControls::TrackControls()
17 : requested(false) {} 17 : requested(false) {}
18 18
19 TrackControls::TrackControls(bool request) 19 TrackControls::TrackControls(bool request)
20 : requested(request) {} 20 : requested(request) {}
21 21
22 TrackControls::TrackControls(const TrackControls& other) = default; 22 TrackControls::TrackControls(const TrackControls& other) = default;
23 23
24 TrackControls::~TrackControls() {} 24 TrackControls::~TrackControls() {}
25 25
26 StreamControls::StreamControls() 26 StreamControls::StreamControls()
27 : audio(false), video(false), hotword_enabled(false) {} 27 : audio(false),
28 video(false),
29 hotword_enabled(false),
30 disable_local_echo(false) {}
28 31
29 StreamControls::StreamControls(bool request_audio, bool request_video) 32 StreamControls::StreamControls(bool request_audio, bool request_video)
30 : audio(request_audio), video(request_video), hotword_enabled(false) {} 33 : audio(request_audio),
34 video(request_video),
35 hotword_enabled(false),
36 disable_local_echo(false) {}
31 37
32 StreamControls::~StreamControls() {} 38 StreamControls::~StreamControls() {}
33 39
34 // static 40 // static
35 const int StreamDeviceInfo::kNoId = -1; 41 const int StreamDeviceInfo::kNoId = -1;
36 42
37 StreamDeviceInfo::StreamDeviceInfo() 43 StreamDeviceInfo::StreamDeviceInfo()
38 : session_id(kNoId) {} 44 : session_id(kNoId) {}
39 45
40 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param, 46 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param,
(...skipping 26 matching lines...) Expand all
67 session_id(kNoId) {} 73 session_id(kNoId) {}
68 74
69 // static 75 // static
70 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first, 76 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first,
71 const StreamDeviceInfo& second) { 77 const StreamDeviceInfo& second) {
72 return first.device.IsEqual(second.device) && 78 return first.device.IsEqual(second.device) &&
73 first.session_id == second.session_id; 79 first.session_id == second.session_id;
74 } 80 }
75 81
76 } // namespace content 82 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698