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

Side by Side Diff: content/renderer/mojo/service_registry_js_wrapper.cc

Issue 1554443003: Stop linking in the old Mojo EDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge and fix new flaky test Created 4 years, 11 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/BUILD.gn ('k') | content/renderer/render_frame_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/mojo/service_registry_js_wrapper.h" 5 #include "content/renderer/mojo/service_registry_js_wrapper.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "content/common/mojo/service_registry_impl.h" 9 #include "content/common/mojo/service_registry_impl.h"
10 #include "content/public/common/service_registry.h" 10 #include "content/public/common/service_registry.h"
11 #include "third_party/mojo/src/mojo/edk/js/handle.h" 11 #include "mojo/edk/js/handle.h"
12 12
13 namespace content { 13 namespace content {
14 14
15 gin::WrapperInfo ServiceRegistryJsWrapper::kWrapperInfo = { 15 gin::WrapperInfo ServiceRegistryJsWrapper::kWrapperInfo = {
16 gin::kEmbedderNativeGin}; 16 gin::kEmbedderNativeGin};
17 const char ServiceRegistryJsWrapper::kModuleName[] = 17 const char ServiceRegistryJsWrapper::kModuleName[] =
18 "content/public/renderer/service_provider"; 18 "content/public/renderer/service_provider";
19 19
20 ServiceRegistryJsWrapper::~ServiceRegistryJsWrapper() { 20 ServiceRegistryJsWrapper::~ServiceRegistryJsWrapper() {
21 } 21 }
(...skipping 23 matching lines...) Expand all
45 std::move(pipe.handle0)); 45 std::move(pipe.handle0));
46 return pipe.handle1.release(); 46 return pipe.handle1.release();
47 } 47 }
48 48
49 ServiceRegistryJsWrapper::ServiceRegistryJsWrapper( 49 ServiceRegistryJsWrapper::ServiceRegistryJsWrapper(
50 base::WeakPtr<ServiceRegistry> service_registry) 50 base::WeakPtr<ServiceRegistry> service_registry)
51 : service_registry_(service_registry) { 51 : service_registry_(service_registry) {
52 } 52 }
53 53
54 } // namespace content 54 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/BUILD.gn ('k') | content/renderer/render_frame_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698