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

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

Issue 317833006: [ICU] Avoid reading ICU data files in render process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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
« no previous file with comments | « base/i18n/icu_util.cc ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 2620 matching lines...) Expand 10 before | Expand all | Expand 10 after
2631 child_process_id); 2631 child_process_id);
2632 if (file.IsValid()) { 2632 if (file.IsValid()) {
2633 mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor, 2633 mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor,
2634 FileDescriptor(file.Pass()))); 2634 FileDescriptor(file.Pass())));
2635 } else { 2635 } else {
2636 LOG(ERROR) << "Failed to create file for minidump, crash reporting will " 2636 LOG(ERROR) << "Failed to create file for minidump, crash reporting will "
2637 "be disabled for this process."; 2637 "be disabled for this process.";
2638 } 2638 }
2639 } 2639 }
2640 2640
2641 base::FilePath app_data_path;
2642 PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
2643 DCHECK(!app_data_path.empty());
2644
2645 flags = base::File::FLAG_OPEN | base::File::FLAG_READ;
2646 base::FilePath icudata_path =
2647 app_data_path.AppendASCII("icudtl.dat");
2648 base::File icudata_file(icudata_path, flags);
2649 DCHECK(icudata_file.IsValid());
2650 mappings->push_back(FileDescriptorInfo(kAndroidICUDataDescriptor,
2651 FileDescriptor(icudata_file.Pass())));
2652
2641 #else 2653 #else
2642 int crash_signal_fd = GetCrashSignalFD(command_line); 2654 int crash_signal_fd = GetCrashSignalFD(command_line);
2643 if (crash_signal_fd >= 0) { 2655 if (crash_signal_fd >= 0) {
2644 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal, 2656 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal,
2645 FileDescriptor(crash_signal_fd, 2657 FileDescriptor(crash_signal_fd,
2646 false))); 2658 false)));
2647 } 2659 }
2648 #endif // defined(OS_ANDROID) 2660 #endif // defined(OS_ANDROID)
2649 } 2661 }
2650 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) 2662 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
2753 switches::kDisableWebRtcEncryption, 2765 switches::kDisableWebRtcEncryption,
2754 }; 2766 };
2755 to_command_line->CopySwitchesFrom(from_command_line, 2767 to_command_line->CopySwitchesFrom(from_command_line,
2756 kWebRtcDevSwitchNames, 2768 kWebRtcDevSwitchNames,
2757 arraysize(kWebRtcDevSwitchNames)); 2769 arraysize(kWebRtcDevSwitchNames));
2758 } 2770 }
2759 } 2771 }
2760 #endif // defined(ENABLE_WEBRTC) 2772 #endif // defined(ENABLE_WEBRTC)
2761 2773
2762 } // namespace chrome 2774 } // namespace chrome
OLDNEW
« no previous file with comments | « base/i18n/icu_util.cc ('k') | content/app/content_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698