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

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

Issue 23691066: Hook up WebRTC logging extension API to the underlying functionality. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 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 | 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 838 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 #endif 849 #endif
850 #if defined(OS_MACOSX) 850 #if defined(OS_MACOSX)
851 host->AddFilter(new SpellCheckMessageFilterMac(id)); 851 host->AddFilter(new SpellCheckMessageFilterMac(id));
852 #endif 852 #endif
853 host->AddFilter(new ChromeNetBenchmarkingMessageFilter( 853 host->AddFilter(new ChromeNetBenchmarkingMessageFilter(
854 id, profile, context)); 854 id, profile, context));
855 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile)); 855 host->AddFilter(new prerender::PrerenderMessageFilter(id, profile));
856 host->AddFilter(new ValidationMessageMessageFilter(id)); 856 host->AddFilter(new ValidationMessageMessageFilter(id));
857 host->AddFilter(new TtsMessageFilter(id, profile)); 857 host->AddFilter(new TtsMessageFilter(id, profile));
858 #if defined(ENABLE_WEBRTC) 858 #if defined(ENABLE_WEBRTC)
859 host->AddFilter(new WebRtcLoggingHandlerHost()); 859 WebRtcLoggingHandlerHost* webrtc_logging_handler_host =
860 new WebRtcLoggingHandlerHost();
861 host->AddFilter(webrtc_logging_handler_host);
862 host->SetUserData(host, new base::UserDataAdapter<WebRtcLoggingHandlerHost>(
863 webrtc_logging_handler_host));
860 #endif 864 #endif
861 #if !defined(DISABLE_NACL) 865 #if !defined(DISABLE_NACL)
862 ExtensionInfoMap* extension_info_map = 866 ExtensionInfoMap* extension_info_map =
863 extensions::ExtensionSystem::Get(profile)->info_map(); 867 extensions::ExtensionSystem::Get(profile)->info_map();
864 host->AddFilter(new NaClHostMessageFilter( 868 host->AddFilter(new NaClHostMessageFilter(
865 id, profile->IsOffTheRecord(), 869 id, profile->IsOffTheRecord(),
866 profile->GetPath(), extension_info_map, 870 profile->GetPath(), extension_info_map,
867 context)); 871 context));
868 #endif 872 #endif
869 #if defined(OS_ANDROID) 873 #if defined(OS_ANDROID)
(...skipping 1670 matching lines...) Expand 10 before | Expand all | Expand 10 after
2540 #if defined(USE_NSS) 2544 #if defined(USE_NSS)
2541 crypto::CryptoModuleBlockingPasswordDelegate* 2545 crypto::CryptoModuleBlockingPasswordDelegate*
2542 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2546 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2543 const GURL& url) { 2547 const GURL& url) {
2544 return chrome::NewCryptoModuleBlockingDialogDelegate( 2548 return chrome::NewCryptoModuleBlockingDialogDelegate(
2545 chrome::kCryptoModulePasswordKeygen, url.host()); 2549 chrome::kCryptoModulePasswordKeygen, url.host());
2546 } 2550 }
2547 #endif 2551 #endif
2548 2552
2549 } // namespace chrome 2553 } // namespace chrome
OLDNEW
« no previous file with comments | « base/supports_user_data.h ('k') | chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698