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

Side by Side Diff: content/renderer/mus/render_widget_window_tree_client_factory.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/renderer/mus/BUILD.gn ('k') | content/renderer/presentation/presentation_dispatcher.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/renderer/mus/render_widget_window_tree_client_factory.h" 5 #include "content/renderer/mus/render_widget_window_tree_client_factory.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/weak_ptr.h" 13 #include "base/memory/weak_ptr.h"
14 #include "base/sequenced_task_runner.h" 14 #include "base/sequenced_task_runner.h"
15 #include "base/threading/thread_task_runner_handle.h" 15 #include "base/threading/thread_task_runner_handle.h"
16 #include "content/common/render_widget_window_tree_client_factory.mojom.h" 16 #include "content/common/render_widget_window_tree_client_factory.mojom.h"
17 #include "content/public/common/connection_filter.h" 17 #include "content/public/common/connection_filter.h"
18 #include "content/public/common/service_manager_connection.h" 18 #include "content/public/common/service_manager_connection.h"
19 #include "content/renderer/mus/render_widget_mus_connection.h" 19 #include "content/renderer/mus/render_widget_mus_connection.h"
20 #include "mojo/public/cpp/bindings/binding_set.h" 20 #include "mojo/public/cpp/bindings/binding_set.h"
21 #include "services/shell/public/cpp/interface_factory.h" 21 #include "services/service_manager/public/cpp/interface_factory.h"
22 #include "services/shell/public/cpp/service.h" 22 #include "services/service_manager/public/cpp/service.h"
23 #include "services/ui/public/interfaces/window_tree.mojom.h" 23 #include "services/ui/public/interfaces/window_tree.mojom.h"
24 #include "url/gurl.h" 24 #include "url/gurl.h"
25 25
26 namespace content { 26 namespace content {
27 27
28 namespace { 28 namespace {
29 29
30 void BindMusConnectionOnMainThread( 30 void BindMusConnectionOnMainThread(
31 uint32_t routing_id, 31 uint32_t routing_id,
32 ui::mojom::WindowTreeClientRequest request) { 32 ui::mojom::WindowTreeClientRequest request) {
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 } // namespace 82 } // namespace
83 83
84 void CreateRenderWidgetWindowTreeClientFactory( 84 void CreateRenderWidgetWindowTreeClientFactory(
85 ServiceManagerConnection* connection) { 85 ServiceManagerConnection* connection) {
86 connection->AddConnectionFilter( 86 connection->AddConnectionFilter(
87 base::MakeUnique<RenderWidgetWindowTreeClientFactoryImpl>()); 87 base::MakeUnique<RenderWidgetWindowTreeClientFactoryImpl>());
88 } 88 }
89 89
90 } // namespace content 90 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/mus/BUILD.gn ('k') | content/renderer/presentation/presentation_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698