OLD | NEW |
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/shell/renderer/shell_content_renderer_client.h" | 5 #include "content/shell/renderer/shell_content_renderer_client.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 void CreateSharedBuffer(const std::string& message, | 84 void CreateSharedBuffer(const std::string& message, |
85 const CreateSharedBufferCallback& callback) override { | 85 const CreateSharedBufferCallback& callback) override { |
86 NOTREACHED(); | 86 NOTREACHED(); |
87 } | 87 } |
88 | 88 |
89 mojo::Binding<mojom::TestService> binding_; | 89 mojo::Binding<mojom::TestService> binding_; |
90 | 90 |
91 DISALLOW_COPY_AND_ASSIGN(TestServiceImpl); | 91 DISALLOW_COPY_AND_ASSIGN(TestServiceImpl); |
92 }; | 92 }; |
93 | 93 |
94 void CreateTestService(mojom::TestServiceRequest request) { | 94 void CreateTestService(const service_manager::BindSourceInfo& source_info, |
| 95 mojom::TestServiceRequest request) { |
95 // Owns itself. | 96 // Owns itself. |
96 new TestServiceImpl(std::move(request)); | 97 new TestServiceImpl(std::move(request)); |
97 } | 98 } |
98 | 99 |
99 } // namespace | 100 } // namespace |
100 | 101 |
101 ShellContentRendererClient::ShellContentRendererClient() {} | 102 ShellContentRendererClient::ShellContentRendererClient() {} |
102 | 103 |
103 ShellContentRendererClient::~ShellContentRendererClient() { | 104 ShellContentRendererClient::~ShellContentRendererClient() { |
104 } | 105 } |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
153 return; | 154 return; |
154 | 155 |
155 static const char kExternalClearKeyKeySystem[] = | 156 static const char kExternalClearKeyKeySystem[] = |
156 "org.chromium.externalclearkey"; | 157 "org.chromium.externalclearkey"; |
157 key_systems->emplace_back( | 158 key_systems->emplace_back( |
158 new cdm::ExternalClearKeyProperties(kExternalClearKeyKeySystem)); | 159 new cdm::ExternalClearKeyProperties(kExternalClearKeyKeySystem)); |
159 } | 160 } |
160 #endif | 161 #endif |
161 | 162 |
162 } // namespace content | 163 } // namespace content |
OLD | NEW |