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

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

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
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.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 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 const GURL& site_url) OVERRIDE; 217 const GURL& site_url) OVERRIDE;
218 virtual bool AllowPepperSocketAPI( 218 virtual bool AllowPepperSocketAPI(
219 content::BrowserContext* browser_context, 219 content::BrowserContext* browser_context,
220 const GURL& url, 220 const GURL& url,
221 const content::SocketPermissionRequest& params) OVERRIDE; 221 const content::SocketPermissionRequest& params) OVERRIDE;
222 virtual base::FilePath GetHyphenDictionaryDirectory() OVERRIDE; 222 virtual base::FilePath GetHyphenDictionaryDirectory() OVERRIDE;
223 virtual ui::SelectFilePolicy* CreateSelectFilePolicy( 223 virtual ui::SelectFilePolicy* CreateSelectFilePolicy(
224 content::WebContents* web_contents) OVERRIDE; 224 content::WebContents* web_contents) OVERRIDE;
225 virtual void GetAdditionalAllowedSchemesForFileSystem( 225 virtual void GetAdditionalAllowedSchemesForFileSystem(
226 std::vector<std::string>* additional_schemes) OVERRIDE; 226 std::vector<std::string>* additional_schemes) OVERRIDE;
227 virtual void GetAdditionalFileSystemMountPointProviders(
228 const base::FilePath& storage_partition_path,
229 ScopedVector<fileapi::FileSystemMountPointProvider>*
230 additional_providers) OVERRIDE;
227 231
228 #if defined(OS_POSIX) && !defined(OS_MACOSX) 232 #if defined(OS_POSIX) && !defined(OS_MACOSX)
229 virtual void GetAdditionalMappedFilesForChildProcess( 233 virtual void GetAdditionalMappedFilesForChildProcess(
230 const CommandLine& command_line, 234 const CommandLine& command_line,
231 int child_process_id, 235 int child_process_id,
232 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 236 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
233 #endif 237 #endif
234 #if defined(OS_WIN) 238 #if defined(OS_WIN)
235 virtual const wchar_t* GetResourceDllName() OVERRIDE; 239 virtual const wchar_t* GetResourceDllName() OVERRIDE;
236 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 240 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
237 bool* success) OVERRIDE; 241 bool* success) OVERRIDE;
238 #endif 242 #endif
239 #if defined(USE_NSS) 243 #if defined(USE_NSS)
240 virtual 244 virtual
241 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 245 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
242 const GURL& url) OVERRIDE; 246 const GURL& url) OVERRIDE;
243 #endif 247 #endif
244 248
245 private: 249 private:
246 // Set of origins that can use TCP/UDP private APIs from NaCl. 250 // Set of origins that can use TCP/UDP private APIs from NaCl.
247 std::set<std::string> allowed_socket_origins_; 251 std::set<std::string> allowed_socket_origins_;
248 252
249 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 253 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
250 }; 254 };
251 255
252 } // namespace chrome 256 } // namespace chrome
253 257
254 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 258 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698