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

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: Rebase Created 6 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/media_galleries/media_galleries_api.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2549 matching lines...) Expand 10 before | Expand all | Expand 10 after
2560 std::vector<std::string>* additional_allowed_schemes) { 2560 std::vector<std::string>* additional_allowed_schemes) {
2561 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2561 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2562 additional_allowed_schemes); 2562 additional_allowed_schemes);
2563 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme); 2563 additional_allowed_schemes->push_back(content::kChromeDevToolsScheme);
2564 additional_allowed_schemes->push_back(content::kChromeUIScheme); 2564 additional_allowed_schemes->push_back(content::kChromeUIScheme);
2565 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2565 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2566 } 2566 }
2567 2567
2568 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers( 2568 void ChromeContentBrowserClient::GetURLRequestAutoMountHandlers(
2569 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) { 2569 std::vector<fileapi::URLRequestAutoMountHandler>* handlers) {
2570 #if !defined(OS_ANDROID)
2571 handlers->push_back(
2572 base::Bind(MediaFileSystemBackend::AttemptAutoMountForURLRequest));
2573 #endif // OS_ANDROID
2570 } 2574 }
2571 2575
2572 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends( 2576 void ChromeContentBrowserClient::GetAdditionalFileSystemBackends(
2573 content::BrowserContext* browser_context, 2577 content::BrowserContext* browser_context,
2574 const base::FilePath& storage_partition_path, 2578 const base::FilePath& storage_partition_path,
2575 ScopedVector<fileapi::FileSystemBackend>* additional_backends) { 2579 ScopedVector<fileapi::FileSystemBackend>* additional_backends) {
2576 #if !defined(OS_ANDROID) 2580 #if !defined(OS_ANDROID)
2577 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool(); 2581 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2578 additional_backends->push_back(new MediaFileSystemBackend( 2582 additional_backends->push_back(new MediaFileSystemBackend(
2579 storage_partition_path, 2583 storage_partition_path,
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
2755 switches::kDisableWebRtcEncryption, 2759 switches::kDisableWebRtcEncryption,
2756 }; 2760 };
2757 to_command_line->CopySwitchesFrom(from_command_line, 2761 to_command_line->CopySwitchesFrom(from_command_line,
2758 kWebRtcDevSwitchNames, 2762 kWebRtcDevSwitchNames,
2759 arraysize(kWebRtcDevSwitchNames)); 2763 arraysize(kWebRtcDevSwitchNames));
2760 } 2764 }
2761 } 2765 }
2762 #endif // defined(ENABLE_WEBRTC) 2766 #endif // defined(ENABLE_WEBRTC)
2763 2767
2764 } // namespace chrome 2768 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/media_galleries/media_galleries_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698