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

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: test fix 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 2044 matching lines...) Expand 10 before | Expand all | Expand 10 after
2055 base::FilePath directory; 2055 base::FilePath directory;
2056 PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory); 2056 PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory);
2057 return directory.Append(FILE_PATH_LITERAL("Hyphen")); 2057 return directory.Append(FILE_PATH_LITERAL("Hyphen"));
2058 } 2058 }
2059 2059
2060 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy( 2060 ui::SelectFilePolicy* ChromeContentBrowserClient::CreateSelectFilePolicy(
2061 WebContents* web_contents) { 2061 WebContents* web_contents) {
2062 return new ChromeSelectFilePolicy(web_contents); 2062 return new ChromeSelectFilePolicy(web_contents);
2063 } 2063 }
2064 2064
2065 std::vector<std::string>
2066 ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem() {
2067 std::vector<std::string> additional_allowed_schemes =
2068 ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem();
2069 additional_allowed_schemes.push_back(kChromeUIScheme);
jam 2013/04/04 17:03:42 content knows about kChromeUIScheme. do you want t
kinuko 2013/04/05 10:16:17 I thought about this, but this looks only necessar
2070 additional_allowed_schemes.push_back(kExtensionScheme);
2071 return additional_allowed_schemes;
2072 }
2073
2065 #if defined(OS_POSIX) && !defined(OS_MACOSX) 2074 #if defined(OS_POSIX) && !defined(OS_MACOSX)
2066 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 2075 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
2067 const CommandLine& command_line, 2076 const CommandLine& command_line,
2068 int child_process_id, 2077 int child_process_id,
2069 std::vector<FileDescriptorInfo>* mappings) { 2078 std::vector<FileDescriptorInfo>* mappings) {
2070 #if defined(OS_ANDROID) 2079 #if defined(OS_ANDROID)
2071 base::FilePath data_path; 2080 base::FilePath data_path;
2072 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path); 2081 PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &data_path);
2073 DCHECK(!data_path.empty()); 2082 DCHECK(!data_path.empty());
2074 2083
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
2187 io_thread_application_locale_ = locale; 2196 io_thread_application_locale_ = locale;
2188 } 2197 }
2189 2198
2190 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 2199 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
2191 const std::string& locale) { 2200 const std::string& locale) {
2192 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 2201 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
2193 io_thread_application_locale_ = locale; 2202 io_thread_application_locale_ = locale;
2194 } 2203 }
2195 2204
2196 } // namespace chrome 2205 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698