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

Side by Side Diff: content/gpu/gpu_child_thread.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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/gpu/gpu_child_thread.h ('k') | content/ppapi_plugin/BUILD.gn » ('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/gpu/gpu_child_thread.h" 5 #include "content/gpu/gpu_child_thread.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 20 matching lines...) Expand all
31 #include "gpu/config/gpu_util.h" 31 #include "gpu/config/gpu_util.h"
32 #include "gpu/ipc/common/memory_stats.h" 32 #include "gpu/ipc/common/memory_stats.h"
33 #include "gpu/ipc/service/gpu_memory_buffer_factory.h" 33 #include "gpu/ipc/service/gpu_memory_buffer_factory.h"
34 #include "gpu/ipc/service/gpu_watchdog_thread.h" 34 #include "gpu/ipc/service/gpu_watchdog_thread.h"
35 #include "ipc/ipc_channel_handle.h" 35 #include "ipc/ipc_channel_handle.h"
36 #include "ipc/ipc_sync_message_filter.h" 36 #include "ipc/ipc_sync_message_filter.h"
37 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h" 37 #include "media/gpu/ipc/service/gpu_jpeg_decode_accelerator.h"
38 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h" 38 #include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
39 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h" 39 #include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
40 #include "media/gpu/ipc/service/media_gpu_channel_manager.h" 40 #include "media/gpu/ipc/service/media_gpu_channel_manager.h"
41 #include "services/shell/public/cpp/interface_registry.h" 41 #include "services/service_manager/public/cpp/interface_registry.h"
42 #include "ui/gl/gl_implementation.h" 42 #include "ui/gl/gl_implementation.h"
43 #include "ui/gl/gl_switches.h" 43 #include "ui/gl/gl_switches.h"
44 #include "ui/gl/gpu_switching_manager.h" 44 #include "ui/gl/gpu_switching_manager.h"
45 #include "ui/gl/init/gl_factory.h" 45 #include "ui/gl/init/gl_factory.h"
46 #include "url/gurl.h" 46 #include "url/gurl.h"
47 47
48 #if defined(USE_OZONE) 48 #if defined(USE_OZONE)
49 #include "ui/ozone/public/ozone_platform.h" 49 #include "ui/ozone/public/ozone_platform.h"
50 #endif 50 #endif
51 51
(...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 524
525 void GpuChildThread::BindServiceFactoryRequest( 525 void GpuChildThread::BindServiceFactoryRequest(
526 shell::mojom::ServiceFactoryRequest request) { 526 shell::mojom::ServiceFactoryRequest request) {
527 DVLOG(1) << "GPU: Binding shell::mojom::ServiceFactoryRequest"; 527 DVLOG(1) << "GPU: Binding shell::mojom::ServiceFactoryRequest";
528 DCHECK(service_factory_); 528 DCHECK(service_factory_);
529 service_factory_bindings_.AddBinding(service_factory_.get(), 529 service_factory_bindings_.AddBinding(service_factory_.get(),
530 std::move(request)); 530 std::move(request));
531 } 531 }
532 532
533 } // namespace content 533 } // namespace content
OLDNEW
« no previous file with comments | « content/gpu/gpu_child_thread.h ('k') | content/ppapi_plugin/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698