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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 | 269 |
270 #if defined(ENABLE_WEBRTC) | 270 #if defined(ENABLE_WEBRTC) |
271 #include "chrome/browser/media/webrtc_logging_handler_host.h" | 271 #include "chrome/browser/media/webrtc_logging_handler_host.h" |
272 #endif | 272 #endif |
273 | 273 |
274 #if defined(ENABLE_MEDIA_ROUTER) | 274 #if defined(ENABLE_MEDIA_ROUTER) |
275 #include "chrome/browser/media/router/media_router_feature.h" | 275 #include "chrome/browser/media/router/media_router_feature.h" |
276 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" | 276 #include "chrome/browser/media/router/presentation_service_delegate_impl.h" |
277 #endif | 277 #endif |
278 | 278 |
| 279 #if defined(ENABLE_WAYLAND_SERVER) |
| 280 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h" |
| 281 #endif |
| 282 |
279 using base::FileDescriptor; | 283 using base::FileDescriptor; |
280 using blink::WebWindowFeatures; | 284 using blink::WebWindowFeatures; |
281 using content::AccessTokenStore; | 285 using content::AccessTokenStore; |
282 using content::BrowserThread; | 286 using content::BrowserThread; |
283 using content::BrowserURLHandler; | 287 using content::BrowserURLHandler; |
284 using content::ChildProcessSecurityPolicy; | 288 using content::ChildProcessSecurityPolicy; |
285 using content::QuotaPermissionContext; | 289 using content::QuotaPermissionContext; |
286 using content::RenderFrameHost; | 290 using content::RenderFrameHost; |
287 using content::RenderViewHost; | 291 using content::RenderViewHost; |
288 using content::ResourceType; | 292 using content::ResourceType; |
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
746 #endif | 750 #endif |
747 | 751 |
748 #if defined(USE_AURA) | 752 #if defined(USE_AURA) |
749 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); | 753 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); |
750 #endif | 754 #endif |
751 | 755 |
752 #if defined(USE_X11) | 756 #if defined(USE_X11) |
753 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); | 757 main_parts->AddParts(new ChromeBrowserMainExtraPartsX11()); |
754 #endif | 758 #endif |
755 | 759 |
| 760 #if defined(ENABLE_WAYLAND_SERVER) |
| 761 main_parts->AddParts(new ChromeBrowserMainExtraPartsExo()); |
| 762 #endif |
| 763 |
756 chrome::AddMetricsExtraParts(main_parts); | 764 chrome::AddMetricsExtraParts(main_parts); |
757 | 765 |
758 return main_parts; | 766 return main_parts; |
759 } | 767 } |
760 | 768 |
761 void ChromeContentBrowserClient::PostAfterStartupTask( | 769 void ChromeContentBrowserClient::PostAfterStartupTask( |
762 const tracked_objects::Location& from_here, | 770 const tracked_objects::Location& from_here, |
763 const scoped_refptr<base::TaskRunner>& task_runner, | 771 const scoped_refptr<base::TaskRunner>& task_runner, |
764 const base::Closure& task) { | 772 const base::Closure& task) { |
765 AfterStartupTaskUtils::PostTask(from_here, task_runner, task); | 773 AfterStartupTaskUtils::PostTask(from_here, task_runner, task); |
(...skipping 2012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2778 if (channel <= kMaxDisableEncryptionChannel) { | 2786 if (channel <= kMaxDisableEncryptionChannel) { |
2779 static const char* const kWebRtcDevSwitchNames[] = { | 2787 static const char* const kWebRtcDevSwitchNames[] = { |
2780 switches::kDisableWebRtcEncryption, | 2788 switches::kDisableWebRtcEncryption, |
2781 }; | 2789 }; |
2782 to_command_line->CopySwitchesFrom(from_command_line, | 2790 to_command_line->CopySwitchesFrom(from_command_line, |
2783 kWebRtcDevSwitchNames, | 2791 kWebRtcDevSwitchNames, |
2784 arraysize(kWebRtcDevSwitchNames)); | 2792 arraysize(kWebRtcDevSwitchNames)); |
2785 } | 2793 } |
2786 } | 2794 } |
2787 #endif // defined(ENABLE_WEBRTC) | 2795 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |