| 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 <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 #if defined(ENABLE_MEDIA_ROUTER) | 366 #if defined(ENABLE_MEDIA_ROUTER) |
| 367 #include "chrome/browser/media/router/media_router_feature.h" | 367 #include "chrome/browser/media/router/media_router_feature.h" |
| 368 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 368 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
| 369 #include "chrome/browser/media/router/receiver_presentation_service_delegate_imp
l.h" | 369 #include "chrome/browser/media/router/receiver_presentation_service_delegate_imp
l.h" |
| 370 #endif // defined(ENABLE_MEDIA_ROUTER) | 370 #endif // defined(ENABLE_MEDIA_ROUTER) |
| 371 | 371 |
| 372 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER) | 372 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER) |
| 373 #include "chrome/browser/media/cast_remoting_connector.h" | 373 #include "chrome/browser/media/cast_remoting_connector.h" |
| 374 #endif | 374 #endif |
| 375 | 375 |
| 376 | 376 #if BUILDFLAG(ENABLE_WAYLAND_SERVER) |
| 377 #if defined(ENABLE_WAYLAND_SERVER) | |
| 378 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" | 377 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" |
| 379 #endif | 378 #endif |
| 380 | 379 |
| 381 #if defined(ENABLE_MOJO_MEDIA) | 380 #if defined(ENABLE_MOJO_MEDIA) |
| 382 #include "chrome/browser/media/output_protection_impl.h" | 381 #include "chrome/browser/media/output_protection_impl.h" |
| 383 #endif | 382 #endif |
| 384 | 383 |
| 385 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) | 384 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS) |
| 386 #include "media/mojo/services/media_service_factory.h" // nogncheck | 385 #include "media/mojo/services/media_service_factory.h" // nogncheck |
| 387 #endif | 386 #endif |
| (...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1042 #if defined(USE_ASH) | 1041 #if defined(USE_ASH) |
| 1043 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); | 1042 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); |
| 1044 #endif | 1043 #endif |
| 1045 #endif | 1044 #endif |
| 1046 #endif | 1045 #endif |
| 1047 | 1046 |
| 1048 #if defined(USE_X11) | 1047 #if defined(USE_X11) |
| 1049 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); | 1048 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); |
| 1050 #endif | 1049 #endif |
| 1051 | 1050 |
| 1052 #if defined(ENABLE_WAYLAND_SERVER) | 1051 #if BUILDFLAG(ENABLE_WAYLAND_SERVER) |
| 1053 main_parts->AddParts(new ChromeBrowserMainExtraPartsExo()); | 1052 main_parts->AddParts(new ChromeBrowserMainExtraPartsExo()); |
| 1054 #endif | 1053 #endif |
| 1055 | 1054 |
| 1056 chrome::AddMetricsExtraParts(main_parts); | 1055 chrome::AddMetricsExtraParts(main_parts); |
| 1057 | 1056 |
| 1058 return main_parts; | 1057 return main_parts; |
| 1059 } | 1058 } |
| 1060 | 1059 |
| 1061 void ChromeContentBrowserClient::PostAfterStartupTask( | 1060 void ChromeContentBrowserClient::PostAfterStartupTask( |
| 1062 const tracked_objects::Location& from_here, | 1061 const tracked_objects::Location& from_here, |
| (...skipping 2489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3552 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 3551 RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
| 3553 return variations::GetVariationParamValue( | 3552 return variations::GetVariationParamValue( |
| 3554 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; | 3553 "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true"; |
| 3555 } | 3554 } |
| 3556 | 3555 |
| 3557 // static | 3556 // static |
| 3558 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( | 3557 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting( |
| 3559 const storage::QuotaSettings* settings) { | 3558 const storage::QuotaSettings* settings) { |
| 3560 g_default_quota_settings = settings; | 3559 g_default_quota_settings = settings; |
| 3561 } | 3560 } |
| OLD | NEW |