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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 140633004: Reland CL to implement browser-side logging to WebRtc log. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: These are the changes that should fix crbug.com/338848 Created 6 years, 10 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
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 "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <set> 7 #include <set>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 #if defined(OS_MACOSX) 916 #if defined(OS_MACOSX)
917 host->AddFilter(new SpellCheckMessageFilterMac(id)); 917 host->AddFilter(new SpellCheckMessageFilterMac(id));
918 #endif 918 #endif
919 host->AddFilter(new ChromeNetBenchmarkingMessageFilter( 919 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(
920 id, profile, context)); 920 id, profile, context));
921 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); 921 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile));
922 host->AddFilter(new TtsMessageFilter(id, profile)); 922 host->AddFilter(new TtsMessageFilter(id, profile));
923 #if defined(ENABLE_WEBRTC) 923 #if defined(ENABLE_WEBRTC)
924 WebRtcLoggingHandlerHost* webrtc_logging_handler_host = 924 WebRtcLoggingHandlerHost* webrtc_logging_handler_host =
925 new WebRtcLoggingHandlerHost(profile); 925 new WebRtcLoggingHandlerHost(profile);
926 host->SetWebRtcLogMessageCallback(base::Bind(
927 &WebRtcLoggingHandlerHost::LogMessage, webrtc_logging_handler_host));
926 host->AddFilter(webrtc_logging_handler_host); 928 host->AddFilter(webrtc_logging_handler_host);
927 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>( 929 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>(
928 webrtc_logging_handler_host)); 930 webrtc_logging_handler_host));
929 #endif 931 #endif
930 #if !defined(DISABLE_NACL) 932 #if !defined(DISABLE_NACL)
931 host->AddFilter(new nacl::NaClHostMessageFilter( 933 host->AddFilter(new nacl::NaClHostMessageFilter(
932 id, profile->IsOffTheRecord(), 934 id, profile->IsOffTheRecord(),
933 profile->GetPath(), 935 profile->GetPath(),
934 context)); 936 context));
935 #endif 937 #endif
(...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after
2701 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on 2703 // releases of Chrome. Permitting "Unknown" allows these APIs to be used on
2702 // Chromium builds as well. 2704 // Chromium builds as well.
2703 return channel <= chrome::VersionInfo::CHANNEL_DEV; 2705 return channel <= chrome::VersionInfo::CHANNEL_DEV;
2704 #else 2706 #else
2705 return false; 2707 return false;
2706 #endif 2708 #endif
2707 } 2709 }
2708 2710
2709 2711
2710 } // namespace chrome 2712 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698