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/renderer/chrome_render_process_observer.h" | 5 #include "chrome/renderer/chrome_render_process_observer.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
215 // any security modules so it is safe to disable the fork check in NSS. | 215 // any security modules so it is safe to disable the fork check in NSS. |
216 crypto::DisableNSSForkCheck(); | 216 crypto::DisableNSSForkCheck(); |
217 crypto::ForceNSSNoDBInit(); | 217 crypto::ForceNSSNoDBInit(); |
218 crypto::EnsureNSSInit(); | 218 crypto::EnsureNSSInit(); |
219 } | 219 } |
220 #elif defined(OS_WIN) | 220 #elif defined(OS_WIN) |
221 // crypt32.dll is used to decode X509 certificates for Chromoting. | 221 // crypt32.dll is used to decode X509 certificates for Chromoting. |
222 // Only load this library when the feature is enabled. | 222 // Only load this library when the feature is enabled. |
223 std::string error; | 223 std::string error; |
224 base::LoadNativeLibrary(FilePath(L"crypt32.dll"), &error); | 224 base::LoadNativeLibrary(FilePath(L"crypt32.dll"), &error); |
225 // ws2_32.dll is used by JingleThreadWrapper for WebRTC and Chromoting. | |
Sergey Ulanov
2012/02/24 20:26:43
nit: add an empty line above this comment.
Ronghua Wu (Left Chromium)
2012/02/24 22:18:51
Done.
| |
226 // TODO(ronghuawu): Remove this once we can get rid of the WSACreateEvent. | |
Sergey Ulanov
2012/02/24 20:26:43
May be better to explain that this is due to Socke
Ronghua Wu (Left Chromium)
2012/02/24 22:18:51
Done.
| |
227 base::LoadNativeLibrary(FilePath(L"ws2_32.dll"), &error); | |
225 #endif | 228 #endif |
226 | 229 |
227 // Note that under Linux, the media library will normally already have | 230 // Note that under Linux, the media library will normally already have |
228 // been initialized by the Zygote before this instance became a Renderer. | 231 // been initialized by the Zygote before this instance became a Renderer. |
229 FilePath media_path; | 232 FilePath media_path; |
230 PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path); | 233 PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path); |
231 if (!media_path.empty()) | 234 if (!media_path.empty()) |
232 media::InitializeMediaLibrary(media_path); | 235 media::InitializeMediaLibrary(media_path); |
233 } | 236 } |
234 | 237 |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
386 if (clear_cache_pending_) { | 389 if (clear_cache_pending_) { |
387 clear_cache_pending_ = false; | 390 clear_cache_pending_ = false; |
388 WebCache::clear(); | 391 WebCache::clear(); |
389 } | 392 } |
390 } | 393 } |
391 | 394 |
392 const RendererContentSettingRules* | 395 const RendererContentSettingRules* |
393 ChromeRenderProcessObserver::content_setting_rules() const { | 396 ChromeRenderProcessObserver::content_setting_rules() const { |
394 return &content_setting_rules_; | 397 return &content_setting_rules_; |
395 } | 398 } |
OLD | NEW |