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

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

Issue 1350023003: Add a Mojo EDK for Chrome that uses one OS pipe per message pipe. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move to mojo::edk namespace in preparation for runtim flag Created 5 years, 3 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
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 "content/common/mojo/service_registry_impl.h" 7 #include "content/common/mojo/service_registry_impl.h"
8 #include "content/public/common/service_registry.h" 8 #include "content/public/common/service_registry.h"
9
10 #if defined(USE_CHROME_EDK)
11 #include "mojo/edk/js/handle.h"
12 #else
9 #include "third_party/mojo/src/mojo/edk/js/handle.h" 13 #include "third_party/mojo/src/mojo/edk/js/handle.h"
14 #endif
10 15
11 namespace content { 16 namespace content {
12 17
13 gin::WrapperInfo ServiceRegistryJsWrapper::kWrapperInfo = { 18 gin::WrapperInfo ServiceRegistryJsWrapper::kWrapperInfo = {
14 gin::kEmbedderNativeGin}; 19 gin::kEmbedderNativeGin};
15 const char ServiceRegistryJsWrapper::kModuleName[] = 20 const char ServiceRegistryJsWrapper::kModuleName[] =
16 "content/public/renderer/service_provider"; 21 "content/public/renderer/service_provider";
17 22
18 ServiceRegistryJsWrapper::~ServiceRegistryJsWrapper() { 23 ServiceRegistryJsWrapper::~ServiceRegistryJsWrapper() {
19 } 24 }
(...skipping 23 matching lines...) Expand all
43 pipe.handle0.Pass()); 48 pipe.handle0.Pass());
44 return pipe.handle1.release(); 49 return pipe.handle1.release();
45 } 50 }
46 51
47 ServiceRegistryJsWrapper::ServiceRegistryJsWrapper( 52 ServiceRegistryJsWrapper::ServiceRegistryJsWrapper(
48 base::WeakPtr<ServiceRegistry> service_registry) 53 base::WeakPtr<ServiceRegistry> service_registry)
49 : service_registry_(service_registry) { 54 : service_registry_(service_registry) {
50 } 55 }
51 56
52 } // namespace content 57 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698