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 "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "content/public/browser/client_certificate_delegate.h" | 10 #include "content/public/browser/client_certificate_delegate.h" |
| 11 #include "content/public/browser/memory_coordinator_delegate.h" |
11 #include "content/public/browser/navigation_ui_data.h" | 12 #include "content/public/browser/navigation_ui_data.h" |
12 #include "content/public/browser/vpn_service_proxy.h" | 13 #include "content/public/browser/vpn_service_proxy.h" |
13 #include "content/public/common/sandbox_type.h" | 14 #include "content/public/common/sandbox_type.h" |
14 #include "media/base/cdm_factory.h" | 15 #include "media/base/cdm_factory.h" |
15 #include "storage/browser/quota/quota_manager.h" | 16 #include "storage/browser/quota/quota_manager.h" |
16 #include "ui/gfx/image/image_skia.h" | 17 #include "ui/gfx/image/image_skia.h" |
17 #include "url/gurl.h" | 18 #include "url/gurl.h" |
18 | 19 |
19 namespace content { | 20 namespace content { |
20 | 21 |
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
417 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" | 418 L"S-1-15-2-3251537155-1984446955-2931258699-841473695-1938553385-" |
418 L"924012148-129201922"); | 419 L"924012148-129201922"); |
419 } | 420 } |
420 #endif // defined(OS_WIN) | 421 #endif // defined(OS_WIN) |
421 | 422 |
422 std::unique_ptr<base::Value> ContentBrowserClient::GetServiceManifestOverlay( | 423 std::unique_ptr<base::Value> ContentBrowserClient::GetServiceManifestOverlay( |
423 const std::string& name) { | 424 const std::string& name) { |
424 return nullptr; | 425 return nullptr; |
425 } | 426 } |
426 | 427 |
| 428 std::unique_ptr<MemoryCoordinatorDelegate> |
| 429 ContentBrowserClient::GetMemoryCoordinatorDelegate() { |
| 430 return std::unique_ptr<MemoryCoordinatorDelegate>(); |
| 431 } |
| 432 |
427 } // namespace content | 433 } // namespace content |
OLD | NEW |