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

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

Issue 16466006: Deprecate media_task_runner() from FileSystemTaskRunners (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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/media_galleries/fileapi/media_file_system_mount_point_provider.h » ('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
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "base/lazy_instance.h" 13 #include "base/lazy_instance.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/prefs/pref_service.h" 15 #include "base/prefs/pref_service.h"
16 #include "base/string_number_conversions.h" 16 #include "base/string_number_conversions.h"
17 #include "base/threading/sequenced_worker_pool.h"
17 #include "base/utf_string_conversions.h" 18 #include "base/utf_string_conversions.h"
18 #include "chrome/app/breakpad_mac.h" 19 #include "chrome/app/breakpad_mac.h"
19 #include "chrome/browser/app_mode/app_mode_utils.h" 20 #include "chrome/browser/app_mode/app_mode_utils.h"
20 #include "chrome/browser/browser_about_handler.h" 21 #include "chrome/browser/browser_about_handler.h"
21 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
22 #include "chrome/browser/browsing_data/browsing_data_helper.h" 23 #include "chrome/browser/browsing_data/browsing_data_helper.h"
23 #include "chrome/browser/browsing_data/browsing_data_remover.h" 24 #include "chrome/browser/browsing_data/browsing_data_remover.h"
24 #include "chrome/browser/character_encoding.h" 25 #include "chrome/browser/character_encoding.h"
25 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 26 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
26 #include "chrome/browser/chrome_quota_permission_context.h" 27 #include "chrome/browser/chrome_quota_permission_context.h"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 #include "chrome/common/extensions/permissions/socket_permission.h" 99 #include "chrome/common/extensions/permissions/socket_permission.h"
99 #include "chrome/common/logging_chrome.h" 100 #include "chrome/common/logging_chrome.h"
100 #include "chrome/common/pref_names.h" 101 #include "chrome/common/pref_names.h"
101 #include "chrome/common/render_messages.h" 102 #include "chrome/common/render_messages.h"
102 #include "chrome/common/url_constants.h" 103 #include "chrome/common/url_constants.h"
103 #include "chromeos/chromeos_constants.h" 104 #include "chromeos/chromeos_constants.h"
104 #include "components/user_prefs/pref_registry_syncable.h" 105 #include "components/user_prefs/pref_registry_syncable.h"
105 #include "content/public/browser/browser_child_process_host.h" 106 #include "content/public/browser/browser_child_process_host.h"
106 #include "content/public/browser/browser_main_parts.h" 107 #include "content/public/browser/browser_main_parts.h"
107 #include "content/public/browser/browser_ppapi_host.h" 108 #include "content/public/browser/browser_ppapi_host.h"
109 #include "content/public/browser/browser_thread.h"
108 #include "content/public/browser/browser_url_handler.h" 110 #include "content/public/browser/browser_url_handler.h"
109 #include "content/public/browser/child_process_data.h" 111 #include "content/public/browser/child_process_data.h"
110 #include "content/public/browser/child_process_security_policy.h" 112 #include "content/public/browser/child_process_security_policy.h"
111 #include "content/public/browser/compositor_util.h" 113 #include "content/public/browser/compositor_util.h"
112 #include "content/public/browser/render_process_host.h" 114 #include "content/public/browser/render_process_host.h"
113 #include "content/public/browser/render_view_host.h" 115 #include "content/public/browser/render_view_host.h"
114 #include "content/public/browser/resource_context.h" 116 #include "content/public/browser/resource_context.h"
115 #include "content/public/browser/site_instance.h" 117 #include "content/public/browser/site_instance.h"
116 #include "content/public/browser/web_contents.h" 118 #include "content/public/browser/web_contents.h"
117 #include "content/public/browser/web_contents_view.h" 119 #include "content/public/browser/web_contents_view.h"
(...skipping 2062 matching lines...) Expand 10 before | Expand all | Expand 10 after
2180 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2182 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2181 additional_allowed_schemes); 2183 additional_allowed_schemes);
2182 additional_allowed_schemes->push_back(kChromeUIScheme); 2184 additional_allowed_schemes->push_back(kChromeUIScheme);
2183 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2185 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2184 } 2186 }
2185 2187
2186 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders( 2188 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders(
2187 const base::FilePath& storage_partition_path, 2189 const base::FilePath& storage_partition_path,
2188 ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) { 2190 ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) {
2189 #if !defined(OS_ANDROID) 2191 #if !defined(OS_ANDROID)
2192 base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
2190 additional_providers->push_back(new MediaFileSystemMountPointProvider( 2193 additional_providers->push_back(new MediaFileSystemMountPointProvider(
2191 storage_partition_path)); 2194 storage_partition_path,
2195 pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
2196 MediaFileSystemMountPointProvider::kMediaTaskRunnerName))));
2192 #endif 2197 #endif
2193 } 2198 }
2194 2199
2195 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2200 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2196 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2201 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2197 const CommandLine& command_line, 2202 const CommandLine& command_line,
2198 int child_process_id, 2203 int child_process_id,
2199 std::vector<FileDescriptorInfo>* mappings) { 2204 std::vector<FileDescriptorInfo>* mappings) {
2200 #if defined(OS_ANDROID) 2205 #if defined(OS_ANDROID)
2201 base::FilePath data_path; 2206 base::FilePath data_path;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
2292 #if defined(USE_NSS) 2297 #if defined(USE_NSS)
2293 crypto::CryptoModuleBlockingPasswordDelegate* 2298 crypto::CryptoModuleBlockingPasswordDelegate*
2294 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2299 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2295 const GURL& url) { 2300 const GURL& url) {
2296 return chrome::NewCryptoModuleBlockingDialogDelegate( 2301 return chrome::NewCryptoModuleBlockingDialogDelegate(
2297 chrome::kCryptoModulePasswordKeygen, url.host()); 2302 chrome::kCryptoModulePasswordKeygen, url.host());
2298 } 2303 }
2299 #endif 2304 #endif
2300 2305
2301 } // namespace chrome 2306 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media_galleries/fileapi/media_file_system_mount_point_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698