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

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

Issue 13415006: Do not refer "chrome" in content/browser/fileapi (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed comments 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 | 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 2082 matching lines...) Expand 10 before | Expand all | Expand 10 after
2093 base::FilePath directory; 2093 base::FilePath directory;
2094 PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory); 2094 PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory);
2095 return directory.Append(FILE_PATH_LITERAL("Hyphen")); 2095 return directory.Append(FILE_PATH_LITERAL("Hyphen"));
2096 } 2096 }
2097 2097
2098 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy( 2098 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy(
2099 WebContents* web_contents) { 2099 WebContents* web_contents) {
2100 return new ChromeSelectFilePolicy(web_contents); 2100 return new ChromeSelectFilePolicy(web_contents);
2101 } 2101 }
2102 2102
2103 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2104 std::vector<std::string>* additional_allowed_schemes) {
2105 DCHECK(additional_allowed_schemes);
jam 2013/04/12 16:50:01 nit: remove this. if null is passed in, the next l
kinuko 2013/04/14 05:11:54 Done.
2106 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
2107 additional_allowed_schemes);
2108 additional_allowed_schemes->push_back(kChromeUIScheme);
2109 additional_allowed_schemes->push_back(extensions::kExtensionScheme);
2110 }
2111
2103 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2112 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2104 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2113 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2105 const CommandLine& command_line, 2114 const CommandLine& command_line,
2106 int child_process_id, 2115 int child_process_id,
2107 std::vector<FileDescriptorInfo>* mappings) { 2116 std::vector<FileDescriptorInfo>* mappings) {
2108 #if defined(OS_ANDROID) 2117 #if defined(OS_ANDROID)
2109 base::FilePath data_path; 2118 base::FilePath data_path;
2110 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); 2119 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
2111 DCHECK(!data_path.empty()); 2120 DCHECK(!data_path.empty());
2112 2121
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
2200 #if defined(USE_NSS) 2209 #if defined(USE_NSS)
2201 crypto::CryptoModuleBlockingPasswordDelegate* 2210 crypto::CryptoModuleBlockingPasswordDelegate*
2202 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2211 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2203 const GURL& url) { 2212 const GURL& url) {
2204 return chrome::NewCryptoModuleBlockingDialogDelegate( 2213 return chrome::NewCryptoModuleBlockingDialogDelegate(
2205 chrome::kCryptoModulePasswordKeygen, url.host()); 2214 chrome::kCryptoModulePasswordKeygen, url.host());
2206 } 2215 }
2207 #endif 2216 #endif
2208 2217
2209 } // namespace chrome 2218 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698