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 873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
884 #else | 884 #else |
885 NOTREACHED(); | 885 NOTREACHED(); |
886 main_parts = new ChromeBrowserMainParts(parameters); | 886 main_parts = new ChromeBrowserMainParts(parameters); |
887 #endif | 887 #endif |
888 | 888 |
889 chrome::AddProfilesExtraParts(main_parts); | 889 chrome::AddProfilesExtraParts(main_parts); |
890 | 890 |
891 // Construct additional browser parts. Stages are called in the order in | 891 // Construct additional browser parts. Stages are called in the order in |
892 // which they are added. | 892 // which they are added. |
893 #if defined(TOOLKIT_VIEWS) | 893 #if defined(TOOLKIT_VIEWS) |
894 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 894 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) |
895 main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); | 895 main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); |
896 #else | 896 #else |
897 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); | 897 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); |
898 #endif | 898 #endif |
899 #endif | 899 #endif |
900 | 900 |
901 // TODO(oshima): Athena on chrome currently requires USE_ASH to build. | 901 // TODO(oshima): Athena on chrome currently requires USE_ASH to build. |
902 // We should reduce the dependency as much as possible. | 902 // We should reduce the dependency as much as possible. |
903 #if defined(USE_ASH) | 903 #if defined(USE_ASH) |
904 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); | 904 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); |
(...skipping 2388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3293 if (channel <= kMaxDisableEncryptionChannel) { | 3293 if (channel <= kMaxDisableEncryptionChannel) { |
3294 static const char* const kWebRtcDevSwitchNames[] = { | 3294 static const char* const kWebRtcDevSwitchNames[] = { |
3295 switches::kDisableWebRtcEncryption, | 3295 switches::kDisableWebRtcEncryption, |
3296 }; | 3296 }; |
3297 to_command_line->CopySwitchesFrom(from_command_line, | 3297 to_command_line->CopySwitchesFrom(from_command_line, |
3298 kWebRtcDevSwitchNames, | 3298 kWebRtcDevSwitchNames, |
3299 arraysize(kWebRtcDevSwitchNames)); | 3299 arraysize(kWebRtcDevSwitchNames)); |
3300 } | 3300 } |
3301 } | 3301 } |
3302 #endif // defined(ENABLE_WEBRTC) | 3302 #endif // defined(ENABLE_WEBRTC) |
OLD | NEW |