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 1823 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1834 | 1834 |
1835 const std::string locale = GetApplicationLocale(); | 1835 const std::string locale = GetApplicationLocale(); |
1836 FilePath locale_pak = ResourceBundle::GetSharedInstance(). | 1836 FilePath locale_pak = ResourceBundle::GetSharedInstance(). |
1837 GetLocaleFilePath(locale, false); | 1837 GetLocaleFilePath(locale, false); |
1838 f = base::CreatePlatformFile(locale_pak, flags, NULL, NULL); | 1838 f = base::CreatePlatformFile(locale_pak, flags, NULL, NULL); |
1839 DCHECK(f != base::kInvalidPlatformFileValue); | 1839 DCHECK(f != base::kInvalidPlatformFileValue); |
1840 mappings->push_back(FileDescriptorInfo(kAndroidLocalePakDescriptor, | 1840 mappings->push_back(FileDescriptorInfo(kAndroidLocalePakDescriptor, |
1841 FileDescriptor(f, true))); | 1841 FileDescriptor(f, true))); |
1842 | 1842 |
1843 #if defined(USE_LINUX_BREAKPAD) | 1843 #if defined(USE_LINUX_BREAKPAD) |
1844 f = CrashDumpManager::GetInstance()->CreateMinidumpFile(child_process_id); | 1844 if (IsCrashReporterEnabled()) { |
Mark Seaborn
2013/01/18 21:49:20
This change could use an explanation in the commit
Yaron
2013/01/22 18:49:07
Done.
| |
1845 if (f == base::kInvalidPlatformFileValue) { | 1845 f = CrashDumpManager::GetInstance()->CreateMinidumpFile(child_process_id); |
1846 LOG(ERROR) << "Failed to create file for minidump, crash reporting will be " | 1846 if (f == base::kInvalidPlatformFileValue) { |
1847 "disabled for this process."; | 1847 LOG(ERROR) << "Failed to create file for minidump, crash reporting will " |
1848 } else { | 1848 " be disabled for this process."; |
Mark Seaborn
2013/01/18 21:49:20
You have two spaces in the middle of this string
Yaron
2013/01/22 18:49:07
Done.
| |
1849 mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor, | 1849 } else { |
1850 FileDescriptor(f, true))); | 1850 mappings->push_back(FileDescriptorInfo(kAndroidMinidumpDescriptor, |
1851 FileDescriptor(f, true))); | |
1852 } | |
1851 } | 1853 } |
1852 #endif // defined(USE_LINUX_BREAKPAD) | 1854 #endif // defined(USE_LINUX_BREAKPAD) |
1853 | 1855 |
1854 #else | 1856 #else |
1855 int crash_signal_fd = GetCrashSignalFD(command_line); | 1857 int crash_signal_fd = GetCrashSignalFD(command_line); |
1856 if (crash_signal_fd >= 0) { | 1858 if (crash_signal_fd >= 0) { |
1857 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal, | 1859 mappings->push_back(FileDescriptorInfo(kCrashDumpSignal, |
1858 FileDescriptor(crash_signal_fd, | 1860 FileDescriptor(crash_signal_fd, |
1859 false))); | 1861 false))); |
1860 } | 1862 } |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1896 io_thread_application_locale_ = locale; | 1898 io_thread_application_locale_ = locale; |
1897 } | 1899 } |
1898 | 1900 |
1899 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 1901 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
1900 const std::string& locale) { | 1902 const std::string& locale) { |
1901 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1903 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1902 io_thread_application_locale_ = locale; | 1904 io_thread_application_locale_ = locale; |
1903 } | 1905 } |
1904 | 1906 |
1905 } // namespace chrome | 1907 } // namespace chrome |
OLD | NEW |