Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(79)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2746363002: Reland of move enable_vulkan from build/config, and move it to the buildflag_header system. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "content/browser/browser_main_loop.h" 5 #include "content/browser/browser_main_loop.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 #include "content/public/browser/render_process_host.h" 86 #include "content/public/browser/render_process_host.h"
87 #include "content/public/browser/tracing_controller.h" 87 #include "content/public/browser/tracing_controller.h"
88 #include "content/public/common/content_client.h" 88 #include "content/public/common/content_client.h"
89 #include "content/public/common/content_features.h" 89 #include "content/public/common/content_features.h"
90 #include "content/public/common/content_switches.h" 90 #include "content/public/common/content_switches.h"
91 #include "content/public/common/main_function_params.h" 91 #include "content/public/common/main_function_params.h"
92 #include "content/public/common/result_codes.h" 92 #include "content/public/common/result_codes.h"
93 #include "device/battery/battery_status_service.h" 93 #include "device/battery/battery_status_service.h"
94 #include "device/gamepad/gamepad_service.h" 94 #include "device/gamepad/gamepad_service.h"
95 #include "device/sensors/device_sensor_service.h" 95 #include "device/sensors/device_sensor_service.h"
96 #include "gpu/vulkan/features.h"
96 #include "media/audio/audio_system_impl.h" 97 #include "media/audio/audio_system_impl.h"
97 #include "media/base/media.h" 98 #include "media/base/media.h"
98 #include "media/base/user_input_monitor.h" 99 #include "media/base/user_input_monitor.h"
99 #include "media/midi/midi_service.h" 100 #include "media/midi/midi_service.h"
100 #include "mojo/edk/embedder/embedder.h" 101 #include "mojo/edk/embedder/embedder.h"
101 #include "mojo/edk/embedder/scoped_ipc_support.h" 102 #include "mojo/edk/embedder/scoped_ipc_support.h"
102 #include "net/base/network_change_notifier.h" 103 #include "net/base/network_change_notifier.h"
103 #include "net/socket/client_socket_factory.h" 104 #include "net/socket/client_socket_factory.h"
104 #include "net/ssl/ssl_config_service.h" 105 #include "net/ssl/ssl_config_service.h"
105 #include "ppapi/features/features.h" 106 #include "ppapi/features/features.h"
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 #include "gpu/config/gpu_driver_bug_workaround_type.h" 200 #include "gpu/config/gpu_driver_bug_workaround_type.h"
200 #include "ui/base/x/x11_util_internal.h" // nogncheck 201 #include "ui/base/x/x11_util_internal.h" // nogncheck
201 #include "ui/gfx/x/x11_connection.h" // nogncheck 202 #include "ui/gfx/x/x11_connection.h" // nogncheck
202 #include "ui/gfx/x/x11_types.h" // nogncheck 203 #include "ui/gfx/x/x11_types.h" // nogncheck
203 #endif 204 #endif
204 205
205 #if defined(USE_NSS_CERTS) 206 #if defined(USE_NSS_CERTS)
206 #include "crypto/nss_util.h" 207 #include "crypto/nss_util.h"
207 #endif 208 #endif
208 209
209 #if defined(ENABLE_VULKAN) 210 #if BUILDFLAG(ENABLE_VULKAN)
210 #include "gpu/vulkan/vulkan_implementation.h" 211 #include "gpu/vulkan/vulkan_implementation.h"
211 #endif 212 #endif
212 213
213 // One of the linux specific headers defines this as a macro. 214 // One of the linux specific headers defines this as a macro.
214 #ifdef DestroyAll 215 #ifdef DestroyAll
215 #undef DestroyAll 216 #undef DestroyAll
216 #endif 217 #endif
217 218
218 namespace content { 219 namespace content {
219 namespace { 220 namespace {
(...skipping 1205 matching lines...) Expand 10 before | Expand all | Expand 10 after
1425 1426
1426 indexed_db_thread_.reset(new base::Thread("IndexedDB")); 1427 indexed_db_thread_.reset(new base::Thread("IndexedDB"));
1427 indexed_db_thread_->Start(); 1428 indexed_db_thread_->Start();
1428 1429
1429 HistogramSynchronizer::GetInstance(); 1430 HistogramSynchronizer::GetInstance();
1430 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 1431 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
1431 // Up the priority of the UI thread. 1432 // Up the priority of the UI thread.
1432 base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY); 1433 base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY);
1433 #endif 1434 #endif
1434 1435
1435 #if defined(ENABLE_VULKAN) 1436 #if BUILDFLAG(ENABLE_VULKAN)
1436 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 1437 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
1437 switches::kEnableVulkan)) { 1438 switches::kEnableVulkan)) {
1438 gpu::InitializeVulkan(); 1439 gpu::InitializeVulkan();
1439 } 1440 }
1440 #endif 1441 #endif
1441 1442
1442 // Initialize the GPU shader cache. This needs to be initialized before 1443 // Initialize the GPU shader cache. This needs to be initialized before
1443 // BrowserGpuChannelHostFactory below, since that depends on an initialized 1444 // BrowserGpuChannelHostFactory below, since that depends on an initialized
1444 // ShaderCacheFactory. 1445 // ShaderCacheFactory.
1445 InitShaderCacheFactorySingleton( 1446 InitShaderCacheFactorySingleton(
(...skipping 341 matching lines...) Expand 10 before | Expand all | Expand 10 after
1787 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), 1788 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
1788 MediaInternals::GetInstance()); 1789 MediaInternals::GetInstance());
1789 } 1790 }
1790 CHECK(audio_manager_); 1791 CHECK(audio_manager_);
1791 1792
1792 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); 1793 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get());
1793 CHECK(audio_system_); 1794 CHECK(audio_system_);
1794 } 1795 }
1795 1796
1796 } // namespace content 1797 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/compositor/gpu_process_transport_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698