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

Side by Side Diff: content/browser/media/webrtc_internals.h

Issue 213703004: Ensure that WebRTC AEC recording checkbox is not set if cancelling file dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Code review fixes + rebase. Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/media/webrtc_internals.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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_BROWSER_MEDIA_WEBRTC_INTERNALS_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_
6 #define CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_ 6 #define CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 return aec_dump_file_path_; 95 return aec_dump_file_path_;
96 } 96 }
97 97
98 void ResetForTesting(); 98 void ResetForTesting();
99 99
100 private: 100 private:
101 friend struct DefaultSingletonTraits<WebRTCInternals>; 101 friend struct DefaultSingletonTraits<WebRTCInternals>;
102 FRIEND_TEST_ALL_PREFIXES(WebRtcBrowserTest, CallWithAecDump); 102 FRIEND_TEST_ALL_PREFIXES(WebRtcBrowserTest, CallWithAecDump);
103 FRIEND_TEST_ALL_PREFIXES(WebRtcBrowserTest, 103 FRIEND_TEST_ALL_PREFIXES(WebRtcBrowserTest,
104 CallWithAecDumpEnabledThenDisabled); 104 CallWithAecDumpEnabledThenDisabled);
105 FRIEND_TEST_ALL_PREFIXES(WebRTCInternalsTest,
106 AecRecordingFileSelectionCanceled);
105 107
106 WebRTCInternals(); 108 WebRTCInternals();
107 virtual ~WebRTCInternals(); 109 virtual ~WebRTCInternals();
108 110
109 void SendUpdate(const std::string& command, base::Value* value); 111 void SendUpdate(const std::string& command, base::Value* value);
110 112
111 // NotificationObserver implementation. 113 // NotificationObserver implementation.
112 virtual void Observe(int type, 114 virtual void Observe(int type,
113 const NotificationSource& source, 115 const NotificationSource& source,
114 const NotificationDetails& details) OVERRIDE; 116 const NotificationDetails& details) OVERRIDE;
115 117
116 // ui::SelectFileDialog::Listener implementation. 118 // ui::SelectFileDialog::Listener implementation.
117 virtual void FileSelected(const base::FilePath& path, 119 virtual void FileSelected(const base::FilePath& path,
118 int index, 120 int index,
119 void* unused_params) OVERRIDE; 121 void* unused_params) OVERRIDE;
122 virtual void FileSelectionCanceled(void* params) OVERRIDE;
120 123
121 // Called when a renderer exits (including crashes). 124 // Called when a renderer exits (including crashes).
122 void OnRendererExit(int render_process_id); 125 void OnRendererExit(int render_process_id);
123 126
124 #if defined(ENABLE_WEBRTC) 127 #if defined(ENABLE_WEBRTC)
125 // Enables AEC dump on all render process hosts using |aec_dump_file_path_|. 128 // Enables AEC dump on all render process hosts using |aec_dump_file_path_|.
126 void EnableAecDumpOnAllRenderProcessHosts(); 129 void EnableAecDumpOnAllRenderProcessHosts();
127 #endif 130 #endif
128 131
129 ObserverList<WebRTCInternalsUIObserver> observers_; 132 ObserverList<WebRTCInternalsUIObserver> observers_;
(...skipping 28 matching lines...) Expand all
158 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 161 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
159 162
160 // AEC dump (diagnostic echo canceller recording) state. 163 // AEC dump (diagnostic echo canceller recording) state.
161 bool aec_dump_enabled_; 164 bool aec_dump_enabled_;
162 base::FilePath aec_dump_file_path_; 165 base::FilePath aec_dump_file_path_;
163 }; 166 };
164 167
165 } // namespace content 168 } // namespace content
166 169
167 #endif // CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_ 170 #endif // CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/webrtc_internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698