OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/browser/shell_content_browser_client.h" | 5 #include "content/shell/browser/shell_content_browser_client.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
212 #endif | 212 #endif |
213 } | 213 } |
214 | 214 |
215 void ShellContentBrowserClient::RegisterOutOfProcessServices( | 215 void ShellContentBrowserClient::RegisterOutOfProcessServices( |
216 OutOfProcessServiceMap* services) { | 216 OutOfProcessServiceMap* services) { |
217 services->insert(std::make_pair(kTestServiceUrl, | 217 services->insert(std::make_pair(kTestServiceUrl, |
218 base::UTF8ToUTF16("Test Service"))); | 218 base::UTF8ToUTF16("Test Service"))); |
219 } | 219 } |
220 | 220 |
221 std::unique_ptr<base::Value> | 221 std::unique_ptr<base::Value> |
222 ShellContentBrowserClient::GetServiceManifestOverlay( | 222 ShellContentBrowserClient::GetServiceManifestOverlay(base::StringPiece name) { |
223 const std::string& name) { | |
224 int id = -1; | 223 int id = -1; |
225 if (name == content::mojom::kBrowserServiceName) | 224 if (name == content::mojom::kBrowserServiceName) |
226 id = IDR_CONTENT_SHELL_BROWSER_MANIFEST_OVERLAY; | 225 id = IDR_CONTENT_SHELL_BROWSER_MANIFEST_OVERLAY; |
227 else if (name == content::mojom::kRendererServiceName) | 226 else if (name == content::mojom::kRendererServiceName) |
228 id = IDR_CONTENT_SHELL_RENDERER_MANIFEST_OVERLAY; | 227 id = IDR_CONTENT_SHELL_RENDERER_MANIFEST_OVERLAY; |
229 else if (name == content::mojom::kUtilityServiceName) | 228 else if (name == content::mojom::kUtilityServiceName) |
230 id = IDR_CONTENT_SHELL_UTILITY_MANIFEST_OVERLAY; | 229 id = IDR_CONTENT_SHELL_UTILITY_MANIFEST_OVERLAY; |
231 if (id == -1) | 230 if (id == -1) |
232 return nullptr; | 231 return nullptr; |
233 | 232 |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
388 ShellBrowserContext* ShellContentBrowserClient::browser_context() { | 387 ShellBrowserContext* ShellContentBrowserClient::browser_context() { |
389 return shell_browser_main_parts_->browser_context(); | 388 return shell_browser_main_parts_->browser_context(); |
390 } | 389 } |
391 | 390 |
392 ShellBrowserContext* | 391 ShellBrowserContext* |
393 ShellContentBrowserClient::off_the_record_browser_context() { | 392 ShellContentBrowserClient::off_the_record_browser_context() { |
394 return shell_browser_main_parts_->off_the_record_browser_context(); | 393 return shell_browser_main_parts_->off_the_record_browser_context(); |
395 } | 394 } |
396 | 395 |
397 } // namespace content | 396 } // namespace content |
OLD | NEW |