| 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 "chrome/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 193 #include "url/origin.h" | 193 #include "url/origin.h" |
| 194 | 194 |
| 195 #if defined(OS_WIN) | 195 #if defined(OS_WIN) |
| 196 #include "base/strings/string_tokenizer.h" | 196 #include "base/strings/string_tokenizer.h" |
| 197 #include "chrome/browser/chrome_browser_main_win.h" | 197 #include "chrome/browser/chrome_browser_main_win.h" |
| 198 #include "sandbox/win/src/sandbox_policy.h" | 198 #include "sandbox/win/src/sandbox_policy.h" |
| 199 #elif defined(OS_MACOSX) | 199 #elif defined(OS_MACOSX) |
| 200 #include "chrome/browser/chrome_browser_main_mac.h" | 200 #include "chrome/browser/chrome_browser_main_mac.h" |
| 201 #elif defined(OS_CHROMEOS) | 201 #elif defined(OS_CHROMEOS) |
| 202 #include "chrome/browser/chromeos/arc/arc_auth_service.h" | 202 #include "chrome/browser/chromeos/arc/arc_auth_service.h" |
| 203 #include "chrome/browser/chromeos/arc/fileapi/arc_content_file_system_backend_de
legate.h" |
| 203 #include "chrome/browser/chromeos/arc/intent_helper/arc_navigation_throttle.h" | 204 #include "chrome/browser/chromeos/arc/intent_helper/arc_navigation_throttle.h" |
| 204 #include "chrome/browser/chromeos/attestation/platform_verification_impl.h" | 205 #include "chrome/browser/chromeos/attestation/platform_verification_impl.h" |
| 205 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 206 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 206 #include "chrome/browser/chromeos/chrome_interface_factory.h" | 207 #include "chrome/browser/chromeos/chrome_interface_factory.h" |
| 207 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" | 208 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h" |
| 208 #include "chrome/browser/chromeos/file_manager/app_id.h" | 209 #include "chrome/browser/chromeos/file_manager/app_id.h" |
| 209 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.
h" | 210 #include "chrome/browser/chromeos/file_system_provider/fileapi/backend_delegate.
h" |
| 210 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" | 211 #include "chrome/browser/chromeos/fileapi/file_system_backend.h" |
| 211 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" | 212 #include "chrome/browser/chromeos/fileapi/mtp_file_system_backend_delegate.h" |
| 212 #include "chrome/browser/chromeos/login/signin/merge_session_navigation_throttle
.h" | 213 #include "chrome/browser/chromeos/login/signin/merge_session_navigation_throttle
.h" |
| (...skipping 2531 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2744 | 2745 |
| 2745 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( | 2746 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( |
| 2746 content::BrowserContext* browser_context, | 2747 content::BrowserContext* browser_context, |
| 2747 const base::FilePath& storage_partition_path, | 2748 const base::FilePath& storage_partition_path, |
| 2748 ScopedVector<storage::FileSystemBackend>* additional_backends) { | 2749 ScopedVector<storage::FileSystemBackend>* additional_backends) { |
| 2749 #if defined(OS_CHROMEOS) | 2750 #if defined(OS_CHROMEOS) |
| 2750 storage::ExternalMountPoints* external_mount_points = | 2751 storage::ExternalMountPoints* external_mount_points = |
| 2751 content::BrowserContext::GetMountPoints(browser_context); | 2752 content::BrowserContext::GetMountPoints(browser_context); |
| 2752 DCHECK(external_mount_points); | 2753 DCHECK(external_mount_points); |
| 2753 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( | 2754 chromeos::FileSystemBackend* backend = new chromeos::FileSystemBackend( |
| 2754 new drive::FileSystemBackendDelegate, | 2755 base::MakeUnique<drive::FileSystemBackendDelegate>(), |
| 2755 new chromeos::file_system_provider::BackendDelegate, | 2756 base::MakeUnique<chromeos::file_system_provider::BackendDelegate>(), |
| 2756 new chromeos::MTPFileSystemBackendDelegate(storage_partition_path), | 2757 base::MakeUnique<chromeos::MTPFileSystemBackendDelegate>( |
| 2757 external_mount_points, | 2758 storage_partition_path), |
| 2758 storage::ExternalMountPoints::GetSystemInstance()); | 2759 base::MakeUnique<arc::ArcContentFileSystemBackendDelegate>(), |
| 2760 external_mount_points, storage::ExternalMountPoints::GetSystemInstance()); |
| 2759 backend->AddSystemMountPoints(); | 2761 backend->AddSystemMountPoints(); |
| 2760 DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal)); | 2762 DCHECK(backend->CanHandleType(storage::kFileSystemTypeExternal)); |
| 2761 additional_backends->push_back(backend); | 2763 additional_backends->push_back(backend); |
| 2762 #endif | 2764 #endif |
| 2763 | 2765 |
| 2764 for (size_t i = 0; i < extra_parts_.size(); ++i) { | 2766 for (size_t i = 0; i < extra_parts_.size(); ++i) { |
| 2765 extra_parts_[i]->GetAdditionalFileSystemBackends( | 2767 extra_parts_[i]->GetAdditionalFileSystemBackends( |
| 2766 browser_context, storage_partition_path, additional_backends); | 2768 browser_context, storage_partition_path, additional_backends); |
| 2767 } | 2769 } |
| 2768 } | 2770 } |
| (...skipping 462 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3231 kWebRtcDevSwitchNames, | 3233 kWebRtcDevSwitchNames, |
| 3232 arraysize(kWebRtcDevSwitchNames)); | 3234 arraysize(kWebRtcDevSwitchNames)); |
| 3233 } | 3235 } |
| 3234 } | 3236 } |
| 3235 #endif // defined(ENABLE_WEBRTC) | 3237 #endif // defined(ENABLE_WEBRTC) |
| 3236 | 3238 |
| 3237 std::unique_ptr<content::MemoryCoordinatorDelegate> | 3239 std::unique_ptr<content::MemoryCoordinatorDelegate> |
| 3238 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { | 3240 ChromeContentBrowserClient::GetMemoryCoordinatorDelegate() { |
| 3239 return memory::ChromeMemoryCoordinatorDelegate::Create(); | 3241 return memory::ChromeMemoryCoordinatorDelegate::Create(); |
| 3240 } | 3242 } |
| OLD | NEW |