OLD | NEW |
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 #include "chrome/browser/ssl/ssl_blocking_page.h" | 71 #include "chrome/browser/ssl/ssl_blocking_page.h" |
72 #include "chrome/browser/ssl/ssl_tab_helper.h" | 72 #include "chrome/browser/ssl/ssl_tab_helper.h" |
73 #include "chrome/browser/tab_contents/tab_util.h" | 73 #include "chrome/browser/tab_contents/tab_util.h" |
74 #include "chrome/browser/toolkit_extra_parts.h" | 74 #include "chrome/browser/toolkit_extra_parts.h" |
75 #include "chrome/browser/ui/chrome_select_file_policy.h" | 75 #include "chrome/browser/ui/chrome_select_file_policy.h" |
76 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" | 76 #include "chrome/browser/ui/tab_contents/chrome_web_contents_view_delegate.h" |
77 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" | 77 #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" |
78 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" | 78 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h" |
79 #include "chrome/browser/user_style_sheet_watcher.h" | 79 #include "chrome/browser/user_style_sheet_watcher.h" |
80 #include "chrome/browser/user_style_sheet_watcher_factory.h" | 80 #include "chrome/browser/user_style_sheet_watcher_factory.h" |
| 81 #include "chrome/browser/webrtc_log_upload_manager.h" |
81 #include "chrome/common/child_process_logging.h" | 82 #include "chrome/common/child_process_logging.h" |
82 #include "chrome/common/chrome_constants.h" | 83 #include "chrome/common/chrome_constants.h" |
83 #include "chrome/common/chrome_paths.h" | 84 #include "chrome/common/chrome_paths.h" |
84 #include "chrome/common/chrome_process_type.h" | 85 #include "chrome/common/chrome_process_type.h" |
85 #include "chrome/common/chrome_switches.h" | 86 #include "chrome/common/chrome_switches.h" |
86 #include "chrome/common/extensions/background_info.h" | 87 #include "chrome/common/extensions/background_info.h" |
87 #include "chrome/common/extensions/extension.h" | 88 #include "chrome/common/extensions/extension.h" |
88 #include "chrome/common/extensions/extension_process_policy.h" | 89 #include "chrome/common/extensions/extension_process_policy.h" |
89 #include "chrome/common/extensions/extension_set.h" | 90 #include "chrome/common/extensions/extension_set.h" |
90 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" | 91 #include "chrome/common/extensions/manifest_handlers/app_isolation_info.h" |
(...skipping 2117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2208 | 2209 |
2209 #if defined(USE_NSS) | 2210 #if defined(USE_NSS) |
2210 crypto::CryptoModuleBlockingPasswordDelegate* | 2211 crypto::CryptoModuleBlockingPasswordDelegate* |
2211 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2212 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2212 const GURL& url) { | 2213 const GURL& url) { |
2213 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2214 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2214 chrome::kCryptoModulePasswordKeygen, url.host()); | 2215 chrome::kCryptoModulePasswordKeygen, url.host()); |
2215 } | 2216 } |
2216 #endif | 2217 #endif |
2217 | 2218 |
| 2219 bool ChromeContentBrowserClient::UploadWebRtcLog( |
| 2220 base::SharedMemory* shared_memory, |
| 2221 uint32 length) { |
| 2222 WebRtcLogUploadManager* upload_manager = |
| 2223 g_browser_process->webrtc_log_upload_manager(); |
| 2224 |
| 2225 // Gives ownership of |shared_memory| to the upload manager. |
| 2226 BrowserThread::PostTask( |
| 2227 BrowserThread::FILE, |
| 2228 FROM_HERE, |
| 2229 base::Bind(&WebRtcLogUploadManager::UploadLog, |
| 2230 base::Unretained(upload_manager), |
| 2231 shared_memory, |
| 2232 length)); |
| 2233 |
| 2234 return true; |
| 2235 } |
| 2236 |
2218 } // namespace chrome | 2237 } // namespace chrome |
OLD | NEW |