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/public/browser/content_browser_client.h" | 5 #include "content/public/browser/content_browser_client.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/guid.h" | 8 #include "base/guid.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
(...skipping 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
425 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" | 425 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" |
426 L"924012148-129201922"); | 426 L"924012148-129201922"); |
427 } | 427 } |
428 #endif // defined(OS_WIN) | 428 #endif // defined(OS_WIN) |
429 | 429 |
430 std::unique_ptr<base::Value> ContentBrowserClient::GetServiceManifestOverlay( | 430 std::unique_ptr<base::Value> ContentBrowserClient::GetServiceManifestOverlay( |
431 const std::string& name) { | 431 const std::string& name) { |
432 return nullptr; | 432 return nullptr; |
433 } | 433 } |
434 | 434 |
| 435 std::vector<ContentBrowserClient::ServiceManifestInfo> |
| 436 ContentBrowserClient::GetExtraServiceManifests() { |
| 437 return std::vector<ContentBrowserClient::ServiceManifestInfo>(); |
| 438 } |
| 439 |
435 std::unique_ptr<MemoryCoordinatorDelegate> | 440 std::unique_ptr<MemoryCoordinatorDelegate> |
436 ContentBrowserClient::GetMemoryCoordinatorDelegate() { | 441 ContentBrowserClient::GetMemoryCoordinatorDelegate() { |
437 return std::unique_ptr<MemoryCoordinatorDelegate>(); | 442 return std::unique_ptr<MemoryCoordinatorDelegate>(); |
438 } | 443 } |
439 | 444 |
440 ::rappor::RapporService* ContentBrowserClient::GetRapporService() { | 445 ::rappor::RapporService* ContentBrowserClient::GetRapporService() { |
441 return nullptr; | 446 return nullptr; |
442 } | 447 } |
443 | 448 |
444 bool ContentBrowserClient::RedirectNonUINonIOBrowserThreadsToTaskScheduler() { | 449 bool ContentBrowserClient::RedirectNonUINonIOBrowserThreadsToTaskScheduler() { |
445 return false; | 450 return false; |
446 } | 451 } |
447 | 452 |
448 } // namespace content | 453 } // namespace content |
OLD | NEW |