| OLD | NEW |
| 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 1646 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1657 } | 1657 } |
| 1658 | 1658 |
| 1659 bool ChromeContentBrowserClient::AllowPepperPrivateFileAPI() { | 1659 bool ChromeContentBrowserClient::AllowPepperPrivateFileAPI() { |
| 1660 return CommandLine::ForCurrentProcess()->HasSwitch( | 1660 return CommandLine::ForCurrentProcess()->HasSwitch( |
| 1661 switches::kPpapiFlashInProcess); | 1661 switches::kPpapiFlashInProcess); |
| 1662 } | 1662 } |
| 1663 | 1663 |
| 1664 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 1664 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 1665 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( | 1665 void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( |
| 1666 const CommandLine& command_line, | 1666 const CommandLine& command_line, |
| 1667 base::GlobalDescriptors::Mapping* mappings) { | 1667 std::vector<FileDescriptorInfo>* mappings) { |
| 1668 int crash_signal_fd = GetCrashSignalFD(command_line); | 1668 int crash_signal_fd = GetCrashSignalFD(command_line); |
| 1669 if (crash_signal_fd >= 0) { | 1669 if (crash_signal_fd >= 0) { |
| 1670 mappings->push_back(std::pair<base::GlobalDescriptors::Key, int>( | 1670 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal, |
| 1671 kCrashDumpSignal, crash_signal_fd)); | 1671 FileDescriptor(crash_signal_fd, |
| 1672 false)); |
| 1672 } | 1673 } |
| 1673 } | 1674 } |
| 1674 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 1675 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
| 1675 | 1676 |
| 1676 #if defined(OS_WIN) | 1677 #if defined(OS_WIN) |
| 1677 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { | 1678 const wchar_t* ChromeContentBrowserClient::GetResourceDllName() { |
| 1678 return chrome::kBrowserResourcesDll; | 1679 return chrome::kBrowserResourcesDll; |
| 1679 } | 1680 } |
| 1680 #endif | 1681 #endif |
| 1681 | 1682 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1726 partition_id = extension->id(); | 1727 partition_id = extension->id(); |
| 1727 } | 1728 } |
| 1728 | 1729 |
| 1729 // Enforce that IsValidStoragePartitionId() implementation stays in sync. | 1730 // Enforce that IsValidStoragePartitionId() implementation stays in sync. |
| 1730 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); | 1731 DCHECK(IsValidStoragePartitionId(browser_context, partition_id)); |
| 1731 return partition_id; | 1732 return partition_id; |
| 1732 } | 1733 } |
| 1733 | 1734 |
| 1734 | 1735 |
| 1735 } // namespace chrome | 1736 } // namespace chrome |
| OLD | NEW |