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

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

Issue 14247034: Move Media Galleries FileAPI code out of webkit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cr-14352004
Patch Set: Add android ifdef. Created 7 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
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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 #if defined(USE_NSS) 164 #if defined(USE_NSS)
165 #include "chrome/browser/ui/crypto_module_password_dialog.h" 165 #include "chrome/browser/ui/crypto_module_password_dialog.h"
166 #endif 166 #endif
167 167
168 #if !defined(OS_CHROMEOS) 168 #if !defined(OS_CHROMEOS)
169 #include "chrome/browser/signin/signin_manager.h" 169 #include "chrome/browser/signin/signin_manager.h"
170 #include "chrome/browser/signin/signin_manager_factory.h" 170 #include "chrome/browser/signin/signin_manager_factory.h"
171 #endif 171 #endif
172 172
173 #if !defined(OS_ANDROID)
174 #include "chrome/browser/media_galleries/fileapi/media_file_system_mount_point_p rovider.h"
175 #endif
176
173 using base::FileDescriptor; 177 using base::FileDescriptor;
174 using content::AccessTokenStore; 178 using content::AccessTokenStore;
175 using content::BrowserChildProcessHostIterator; 179 using content::BrowserChildProcessHostIterator;
176 using content::BrowserThread; 180 using content::BrowserThread;
177 using content::BrowserURLHandler; 181 using content::BrowserURLHandler;
178 using content::ChildProcessSecurityPolicy; 182 using content::ChildProcessSecurityPolicy;
179 using content::FileDescriptorInfo; 183 using content::FileDescriptorInfo;
180 using content::QuotaPermissionContext; 184 using content::QuotaPermissionContext;
181 using content::RenderViewHost; 185 using content::RenderViewHost;
182 using content::SiteInstance; 186 using content::SiteInstance;
(...skipping 1918 matching lines...) Expand 10 before | Expand all | Expand 10 after
2101 } 2105 }
2102 2106
2103 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2107 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2104 std::vector<std::string>* additional_allowed_schemes) { 2108 std::vector<std::string>* additional_allowed_schemes) {
2105 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem( 2109 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2106 additional_allowed_schemes); 2110 additional_allowed_schemes);
2107 additional_allowed_schemes->push_back(kChromeUIScheme); 2111 additional_allowed_schemes->push_back(kChromeUIScheme);
2108 additional_allowed_schemes->push_back(extensions::kExtensionScheme); 2112 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2109 } 2113 }
2110 2114
2115 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders(
2116 const base::FilePath& storage_partition_path,
2117 ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) {
2118 #if !defined(OS_ANDROID)
2119 additional_providers->push_back(new MediaFileSystemMountPointProvider(
2120 storage_partition_path));
2121 #endif
2122 }
2123
2111 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2124 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2112 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2125 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2113 const CommandLine& command_line, 2126 const CommandLine& command_line,
2114 int child_process_id, 2127 int child_process_id,
2115 std::vector<FileDescriptorInfo>* mappings) { 2128 std::vector<FileDescriptorInfo>* mappings) {
2116 #if defined(OS_ANDROID) 2129 #if defined(OS_ANDROID)
2117 base::FilePath data_path; 2130 base::FilePath data_path;
2118 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); 2131 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
2119 DCHECK(!data_path.empty()); 2132 DCHECK(!data_path.empty());
2120 2133
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
2208 #if defined(USE_NSS) 2221 #if defined(USE_NSS)
2209 crypto::CryptoModuleBlockingPasswordDelegate* 2222 crypto::CryptoModuleBlockingPasswordDelegate*
2210 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2223 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2211 const GURL& url) { 2224 const GURL& url) {
2212 return chrome::NewCryptoModuleBlockingDialogDelegate( 2225 return chrome::NewCryptoModuleBlockingDialogDelegate(
2213 chrome::kCryptoModulePasswordKeygen, url.host()); 2226 chrome::kCryptoModulePasswordKeygen, url.host());
2214 } 2227 }
2215 #endif 2228 #endif
2216 2229
2217 } // namespace chrome 2230 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/media_galleries/fileapi/device_media_async_file_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698