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 2623 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2634 child_process_id); | 2634 child_process_id); |
2635 if (file.IsValid()) { | 2635 if (file.IsValid()) { |
2636 mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor, | 2636 mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor, |
2637 FileDescriptor(file.Pass()))); | 2637 FileDescriptor(file.Pass()))); |
2638 } else { | 2638 } else { |
2639 LOG(ERROR) << "Failed to create file for minidump, crash reporting will " | 2639 LOG(ERROR) << "Failed to create file for minidump, crash reporting will " |
2640 "be disabled for this process."; | 2640 "be disabled for this process."; |
2641 } | 2641 } |
2642 } | 2642 } |
2643 | 2643 |
| 2644 base::FilePath app_data_path; |
| 2645 PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path); |
| 2646 DCHECK(!app_data_path.empty()); |
| 2647 |
| 2648 flags = base::File::FLAG_OPEN | base::File::FLAG_READ; |
| 2649 base::FilePath icudata_path = |
| 2650 app_data_path.AppendASCII("icudtl.dat"); |
| 2651 base::File icudata_file(icudata_path, flags); |
| 2652 DCHECK(icudata_file.IsValid()); |
| 2653 mappings->push_back(FileDescriptorInfo(kAndroidICUDataDescriptor, |
| 2654 FileDescriptor(icudata_file.Pass()))); |
| 2655 |
2644 #else | 2656 #else |
2645 int crash_signal_fd = GetCrashSignalFD(command_line); | 2657 int crash_signal_fd = GetCrashSignalFD(command_line); |
2646 if (crash_signal_fd >= 0) { | 2658 if (crash_signal_fd >= 0) { |
2647 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal, | 2659 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal, |
2648 FileDescriptor(crash_signal_fd, | 2660 FileDescriptor(crash_signal_fd, |
2649 false))); | 2661 false))); |
2650 } | 2662 } |
2651 #endif // defined(OS_ANDROID) | 2663 #endif // defined(OS_ANDROID) |
2652 } | 2664 } |
2653 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 2665 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2756 switches::kDisableWebRtcEncryption, | 2768 switches::kDisableWebRtcEncryption, |
2757 }; | 2769 }; |
2758 to_command_line->CopySwitchesFrom(from_command_line, | 2770 to_command_line->CopySwitchesFrom(from_command_line, |
2759 kWebRtcDevSwitchNames, | 2771 kWebRtcDevSwitchNames, |
2760 arraysize(kWebRtcDevSwitchNames)); | 2772 arraysize(kWebRtcDevSwitchNames)); |
2761 } | 2773 } |
2762 } | 2774 } |
2763 #endif // defined(ENABLE_WEBRTC) | 2775 #endif // defined(ENABLE_WEBRTC) |
2764 | 2776 |
2765 } // namespace chrome | 2777 } // namespace chrome |
OLD | NEW |