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

Side by Side Diff: chrome/renderer/chrome_render_process_observer.cc

Issue 9463023: The ws2_32.dll is needed by JingleThreadWrapper for WebRTC and Chromoting. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « no previous file | no next file » | 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) 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
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.
226
227 // TODO(ronghuawu): Remove this once we can get rid of the dependency to
228 // SocketServer (which uses WSACreateEvent) from JingleThreadWrapper.
229 // http://crbug.com/115702
230 base::LoadNativeLibrary(FilePath(L"ws2_32.dll"), &error);
225 #endif 231 #endif
226 232
227 // Note that under Linux, the media library will normally already have 233 // Note that under Linux, the media library will normally already have
228 // been initialized by the Zygote before this instance became a Renderer. 234 // been initialized by the Zygote before this instance became a Renderer.
229 FilePath media_path; 235 FilePath media_path;
230 PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path); 236 PathService::Get(chrome::DIR_MEDIA_LIBS, &media_path);
231 if (!media_path.empty()) 237 if (!media_path.empty())
232 media::InitializeMediaLibrary(media_path); 238 media::InitializeMediaLibrary(media_path);
233 } 239 }
234 240
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 if (clear_cache_pending_) { 392 if (clear_cache_pending_) {
387 clear_cache_pending_ = false; 393 clear_cache_pending_ = false;
388 WebCache::clear(); 394 WebCache::clear();
389 } 395 }
390 } 396 }
391 397
392 const RendererContentSettingRules* 398 const RendererContentSettingRules*
393 ChromeRenderProcessObserver::content_setting_rules() const { 399 ChromeRenderProcessObserver::content_setting_rules() const {
394 return &content_setting_rules_; 400 return &content_setting_rules_;
395 } 401 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698