Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(606)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 185393012: Change media galleries to external file system type to add toURL support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add test for URL access Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 2540 matching lines...) Expand 10 before | Expand all | Expand 10 after
2551 std::vector<std::string>* additional_allowed_schemes) { 2551 std::vector<std::string>* additional_allowed_schemes) {
2552 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2552 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2553 additional_allowed_schemes); 2553 additional_allowed_schemes);
2554 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); 2554 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
2555 additional_allowed_schemes->push_back(content::kChromeUIScheme); 2555 additional_allowed_schemes->push_back(content::kChromeUIScheme);
2556 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2556 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2557 } 2557 }
2558 2558
2559 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2559 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2560 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) { 2560 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) {
2561 #if !defined(OS_ANDROID)
2562 handlers->push_back(
2563 base::Bind(MediaFileSystemBackend::AttemptAutoMountForURLRequest));
2564 #endif // OS_ANDROID
2561 } 2565 }
2562 2566
2563 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2567 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2564 content::BrowserContext* browser_context, 2568 content::BrowserContext* browser_context,
2565 const base::FilePath& storage_partition_path, 2569 const base::FilePath& storage_partition_path,
2566 ScopedVector<fileapi::FileSystemBackend>* additional_backends) { 2570 ScopedVector<fileapi::FileSystemBackend>* additional_backends) {
2567 #if !defined(OS_ANDROID) 2571 #if !defined(OS_ANDROID)
2568 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); 2572 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2569 additional_backends->push_back(new MediaFileSystemBackend( 2573 additional_backends->push_back(new MediaFileSystemBackend(
2570 storage_partition_path, 2574 storage_partition_path,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2746 switches::kDisableWebRtcEncryption, 2750 switches::kDisableWebRtcEncryption,
2747 }; 2751 };
2748 to_command_line->CopySwitchesFrom(from_command_line, 2752 to_command_line->CopySwitchesFrom(from_command_line,
2749 kWebRtcDevSwitchNames, 2753 kWebRtcDevSwitchNames,
2750 arraysize(kWebRtcDevSwitchNames)); 2754 arraysize(kWebRtcDevSwitchNames));
2751 } 2755 }
2752 } 2756 }
2753 #endif // defined(ENABLE_WEBRTC) 2757 #endif // defined(ENABLE_WEBRTC)
2754 2758
2755 } // namespace chrome 2759 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698