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 <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 2529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2540 std::vector<std::string>* additional_allowed_schemes) { | 2540 std::vector<std::string>* additional_allowed_schemes) { |
2541 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( | 2541 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( |
2542 additional_allowed_schemes); | 2542 additional_allowed_schemes); |
2543 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); | 2543 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); |
2544 additional_allowed_schemes->push_back(content::kChromeUIScheme); | 2544 additional_allowed_schemes->push_back(content::kChromeUIScheme); |
2545 additional_allowed_schemes->push_back(extensions::kExtensionScheme); | 2545 additional_allowed_schemes->push_back(extensions::kExtensionScheme); |
2546 } | 2546 } |
2547 | 2547 |
2548 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( | 2548 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( |
2549 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) { | 2549 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) { |
| 2550 #if !defined(OS_ANDROID) |
| 2551 handlers->push_back( |
| 2552 base::Bind(MediaFileSystemBackend::AttemptAutoMountForURLRequest)); |
| 2553 #endif // OS_ANDROID |
2550 } | 2554 } |
2551 | 2555 |
2552 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( | 2556 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( |
2553 content::BrowserContext* browser_context, | 2557 content::BrowserContext* browser_context, |
2554 const base::FilePath& storage_partition_path, | 2558 const base::FilePath& storage_partition_path, |
2555 ScopedVector<fileapi::FileSystemBackend>* additional_backends) { | 2559 ScopedVector<fileapi::FileSystemBackend>* additional_backends) { |
2556 #if !defined(OS_ANDROID) | 2560 #if !defined(OS_ANDROID) |
2557 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); | 2561 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); |
2558 additional_backends->push_back(new MediaFileSystemBackend( | 2562 additional_backends->push_back(new MediaFileSystemBackend( |
2559 storage_partition_path, | 2563 storage_partition_path, |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2735 switches::kDisableWebRtcEncryption, | 2739 switches::kDisableWebRtcEncryption, |
2736 }; | 2740 }; |
2737 to_command_line->CopySwitchesFrom(from_command_line, | 2741 to_command_line->CopySwitchesFrom(from_command_line, |
2738 kWebRtcDevSwitchNames, | 2742 kWebRtcDevSwitchNames, |
2739 arraysize(kWebRtcDevSwitchNames)); | 2743 arraysize(kWebRtcDevSwitchNames)); |
2740 } | 2744 } |
2741 } | 2745 } |
2742 #endif // defined(ENABLE_WEBRTC) | 2746 #endif // defined(ENABLE_WEBRTC) |
2743 | 2747 |
2744 } // namespace chrome | 2748 } // namespace chrome |
OLD | NEW |