| 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_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <algorithm> | 10 #include <algorithm> |
| (...skipping 440 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 451 DCHECK_EQ(WORKER_POOL_COUNT, params_vector.size()); | 451 DCHECK_EQ(WORKER_POOL_COUNT, params_vector.size()); |
| 452 | 452 |
| 453 base::TaskScheduler::CreateAndSetDefaultTaskScheduler( | 453 base::TaskScheduler::CreateAndSetDefaultTaskScheduler( |
| 454 params_vector, base::Bind(WorkerPoolIndexForTraits)); | 454 params_vector, base::Bind(WorkerPoolIndexForTraits)); |
| 455 | 455 |
| 456 // TODO(gab): Remove this when http://crbug.com/622400 concludes. | 456 // TODO(gab): Remove this when http://crbug.com/622400 concludes. |
| 457 const auto sequenced_worker_pool_param = | 457 const auto sequenced_worker_pool_param = |
| 458 variation_params.find("RedirectSequencedWorkerPools"); | 458 variation_params.find("RedirectSequencedWorkerPools"); |
| 459 if (sequenced_worker_pool_param != variation_params.end() && | 459 if (sequenced_worker_pool_param != variation_params.end() && |
| 460 sequenced_worker_pool_param->second == "true") { | 460 sequenced_worker_pool_param->second == "true") { |
| 461 base::SequencedWorkerPool:: | 461 base::SequencedWorkerPool::RedirectToTaskSchedulerForProcess(); |
| 462 RedirectSequencedWorkerPoolsToTaskSchedulerForProcess(); | |
| 463 } | 462 } |
| 464 } | 463 } |
| 465 | 464 |
| 466 // Returns the new local state object, guaranteed non-NULL. | 465 // Returns the new local state object, guaranteed non-NULL. |
| 467 // |local_state_task_runner| must be a shutdown-blocking task runner. | 466 // |local_state_task_runner| must be a shutdown-blocking task runner. |
| 468 PrefService* InitializeLocalState( | 467 PrefService* InitializeLocalState( |
| 469 base::SequencedTaskRunner* local_state_task_runner, | 468 base::SequencedTaskRunner* local_state_task_runner, |
| 470 const base::CommandLine& parsed_command_line) { | 469 const base::CommandLine& parsed_command_line) { |
| 471 TRACE_EVENT0("startup", "ChromeBrowserMainParts::InitializeLocalState") | 470 TRACE_EVENT0("startup", "ChromeBrowserMainParts::InitializeLocalState") |
| 472 | 471 |
| (...skipping 1757 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2230 chromeos::CrosSettings::Shutdown(); | 2229 chromeos::CrosSettings::Shutdown(); |
| 2231 #endif // defined(OS_CHROMEOS) | 2230 #endif // defined(OS_CHROMEOS) |
| 2232 #endif // defined(OS_ANDROID) | 2231 #endif // defined(OS_ANDROID) |
| 2233 } | 2232 } |
| 2234 | 2233 |
| 2235 // Public members: | 2234 // Public members: |
| 2236 | 2235 |
| 2237 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 2236 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 2238 chrome_extra_parts_.push_back(parts); | 2237 chrome_extra_parts_.push_back(parts); |
| 2239 } | 2238 } |
| OLD | NEW |