| 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 874 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 885 #else | 885 #else |
| 886 NOTREACHED(); | 886 NOTREACHED(); |
| 887 main_parts = new ChromeBrowserMainParts(parameters); | 887 main_parts = new ChromeBrowserMainParts(parameters); |
| 888 #endif | 888 #endif |
| 889 | 889 |
| 890 chrome::AddProfilesExtraParts(main_parts); | 890 chrome::AddProfilesExtraParts(main_parts); |
| 891 | 891 |
| 892 // Construct additional browser parts. Stages are called in the order in | 892 // Construct additional browser parts. Stages are called in the order in |
| 893 // which they are added. | 893 // which they are added. |
| 894 #if defined(TOOLKIT_VIEWS) | 894 #if defined(TOOLKIT_VIEWS) |
| 895 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) | 895 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE) |
| 896 main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); | 896 main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); |
| 897 #else | 897 #else |
| 898 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); | 898 main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); |
| 899 #endif | 899 #endif |
| 900 #endif | 900 #endif |
| 901 | 901 |
| 902 // TODO(oshima): Athena on chrome currently requires USE_ASH to build. | 902 // TODO(oshima): Athena on chrome currently requires USE_ASH to build. |
| 903 // We should reduce the dependency as much as possible. | 903 // We should reduce the dependency as much as possible. |
| 904 #if defined(USE_ASH) | 904 #if defined(USE_ASH) |
| 905 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); | 905 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); |
| (...skipping 2343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3249 kWebRtcDevSwitchNames, | 3249 kWebRtcDevSwitchNames, |
| 3250 arraysize(kWebRtcDevSwitchNames)); | 3250 arraysize(kWebRtcDevSwitchNames)); |
| 3251 } | 3251 } |
| 3252 } | 3252 } |
| 3253 #endif // defined(ENABLE_WEBRTC) | 3253 #endif // defined(ENABLE_WEBRTC) |
| 3254 | 3254 |
| 3255 std::unique_ptr<content::MemoryCoordinatorDelegate> | 3255 std::unique_ptr<content::MemoryCoordinatorDelegate> |
| 3256 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { | 3256 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { |
| 3257 return memory::ChromeMemoryCoordinatorDelegate::Create(); | 3257 return memory::ChromeMemoryCoordinatorDelegate::Create(); |
| 3258 } | 3258 } |
| OLD | NEW |