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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 1882433002: Removing NSS files and USE_OPENSSL flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 8 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 | « components/variations/variations_seed_store_unittest.cc ('k') | content/test/BUILD.gn » ('j') | 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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 #include "content/browser/plugin_service_impl.h" 169 #include "content/browser/plugin_service_impl.h"
170 #endif 170 #endif
171 171
172 #if defined(USE_X11) 172 #if defined(USE_X11)
173 #include "ui/base/x/x11_util_internal.h" 173 #include "ui/base/x/x11_util_internal.h"
174 #include "ui/gfx/x/x11_connection.h" // nogncheck 174 #include "ui/gfx/x/x11_connection.h" // nogncheck
175 #include "ui/gfx/x/x11_switches.h" // nogncheck 175 #include "ui/gfx/x/x11_switches.h" // nogncheck
176 #include "ui/gfx/x/x11_types.h" // nogncheck 176 #include "ui/gfx/x/x11_types.h" // nogncheck
177 #endif 177 #endif
178 178
179 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) 179 #if defined(USE_NSS_CERTS)
180 #include "crypto/nss_util.h" 180 #include "crypto/nss_util.h"
181 #endif 181 #endif
182 182
183 #if defined(MOJO_SHELL_CLIENT) 183 #if defined(MOJO_SHELL_CLIENT)
184 #include "services/shell/public/cpp/connector.h" 184 #include "services/shell/public/cpp/connector.h"
185 #include "ui/views/mus/window_manager_connection.h" 185 #include "ui/views/mus/window_manager_connection.h"
186 #endif 186 #endif
187 187
188 // One of the linux specific headers defines this as a macro. 188 // One of the linux specific headers defines this as a macro.
189 #ifdef DestroyAll 189 #ifdef DestroyAll
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
488 // Low soft limits combined with liberal use of file descriptors means power 488 // Low soft limits combined with liberal use of file descriptors means power
489 // users can easily hit this limit with many open tabs. Bump up the limit to 489 // users can easily hit this limit with many open tabs. Bump up the limit to
490 // an arbitrarily high number. See https://crbug.com/539567 490 // an arbitrarily high number. See https://crbug.com/539567
491 base::SetFdLimit(8192); 491 base::SetFdLimit(8192);
492 #endif // default(OS_MACOSX) 492 #endif // default(OS_MACOSX)
493 493
494 #if defined(OS_WIN) 494 #if defined(OS_WIN)
495 net::EnsureWinsockInit(); 495 net::EnsureWinsockInit();
496 #endif 496 #endif
497 497
498 #if defined(USE_NSS_CERTS) || !defined(USE_OPENSSL) 498 #if defined(USE_NSS_CERTS)
499 // We want to be sure to init NSPR on the main thread. 499 // We want to be sure to init NSPR on the main thread.
500 crypto::EnsureNSPRInit(); 500 crypto::EnsureNSPRInit();
501 #endif 501 #endif
502 502
503 if (parsed_command_line_.HasSwitch(switches::kRendererProcessLimit)) { 503 if (parsed_command_line_.HasSwitch(switches::kRendererProcessLimit)) {
504 std::string limit_string = parsed_command_line_.GetSwitchValueASCII( 504 std::string limit_string = parsed_command_line_.GetSwitchValueASCII(
505 switches::kRendererProcessLimit); 505 switches::kRendererProcessLimit);
506 size_t process_limit; 506 size_t process_limit;
507 if (base::StringToSizeT(limit_string, &process_limit)) { 507 if (base::StringToSizeT(limit_string, &process_limit)) {
508 RenderProcessHost::SetMaxRendererProcessCount(process_limit); 508 RenderProcessHost::SetMaxRendererProcessCount(process_limit);
(...skipping 971 matching lines...) Expand 10 before | Expand all | Expand 10 after
1480 audio_task_runner = audio_thread_->task_runner(); 1480 audio_task_runner = audio_thread_->task_runner();
1481 worker_task_runner = audio_thread_->task_runner(); 1481 worker_task_runner = audio_thread_->task_runner();
1482 monitor_task_runner = io_thread_->task_runner(); 1482 monitor_task_runner = io_thread_->task_runner();
1483 #endif // defined(OS_MACOSX) 1483 #endif // defined(OS_MACOSX)
1484 audio_manager_ = media::AudioManager::Create( 1484 audio_manager_ = media::AudioManager::Create(
1485 std::move(audio_task_runner), std::move(worker_task_runner), 1485 std::move(audio_task_runner), std::move(worker_task_runner),
1486 std::move(monitor_task_runner), MediaInternals::GetInstance()); 1486 std::move(monitor_task_runner), MediaInternals::GetInstance());
1487 } 1487 }
1488 1488
1489 } // namespace content 1489 } // namespace content
OLDNEW
« no previous file with comments | « components/variations/variations_seed_store_unittest.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698