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

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

Issue 11437038: Revert 171408 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years 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 1808 matching lines...) Expand 10 before | Expand all | Expand 10 after
1819 1819
1820 extensions::SocketPermission::CheckParam extension_params( 1820 extensions::SocketPermission::CheckParam extension_params(
1821 params.type, params.host, params.port); 1821 params.type, params.host, params.port);
1822 if (extension->CheckAPIPermissionWithParam(APIPermission::kSocket, 1822 if (extension->CheckAPIPermissionWithParam(APIPermission::kSocket,
1823 &extension_params)) 1823 &extension_params))
1824 return true; 1824 return true;
1825 1825
1826 return false; 1826 return false;
1827 } 1827 }
1828 1828
1829 bool ChromeContentBrowserClient::AllowPepperPrivateFileAPI() {
1830 return CommandLine::ForCurrentProcess()->HasSwitch(
1831 switches::kPpapiFlashInProcess);
1832 }
1833
1829 FilePath ChromeContentBrowserClient::GetHyphenDictionaryDirectory() { 1834 FilePath ChromeContentBrowserClient::GetHyphenDictionaryDirectory() {
1830 FilePath directory; 1835 FilePath directory;
1831 PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory); 1836 PathService::Get(chrome::DIR_APP_DICTIONARIES, &directory);
1832 return directory.Append(FILE_PATH_LITERAL("Hyphen")); 1837 return directory.Append(FILE_PATH_LITERAL("Hyphen"));
1833 } 1838 }
1834 1839
1835 #if defined(OS_POSIX) && !defined(OS_MACOSX) 1840 #if defined(OS_POSIX) && !defined(OS_MACOSX)
1836 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( 1841 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
1837 const CommandLine& command_line, 1842 const CommandLine& command_line,
1838 int child_process_id, 1843 int child_process_id,
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
1928 io_thread_application_locale_ = locale; 1933 io_thread_application_locale_ = locale;
1929 } 1934 }
1930 1935
1931 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( 1936 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread(
1932 const std::string& locale) { 1937 const std::string& locale) {
1933 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 1938 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
1934 io_thread_application_locale_ = locale; 1939 io_thread_application_locale_ = locale;
1935 } 1940 }
1936 1941
1937 } // namespace chrome 1942 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.h ('k') | chrome/browser/nacl_host/nacl_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698