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

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

Issue 1481703002: win: Move Crashpad all into chrome.exe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix and rebase Created 5 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
« no previous file with comments | « chrome/browser/crash_upload_list_crashpad.h ('k') | chrome/browser_tests.isolate » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/crash_upload_list_crashpad.h" 5 #include "chrome/browser/crash_upload_list_crashpad.h"
6 6
7 #include "base/threading/sequenced_worker_pool.h" 7 #include "base/threading/sequenced_worker_pool.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "chrome/common/chrome_constants.h"
9 #include "components/crash/content/app/crashpad.h" 10 #include "components/crash/content/app/crashpad.h"
10 11
12 namespace {
13
14 #if defined(OS_WIN)
15 typedef void (*GetUploadedReportsPointer)(
16 const crash_reporter::UploadedReport** reports,
17 size_t* report_count);
18
19 void GetUploadedReportsThunk(
20 std::vector<crash_reporter::UploadedReport>* uploaded_reports) {
21 static GetUploadedReportsPointer get_uploaded_reports = []() {
22 HMODULE exe_module = GetModuleHandle(chrome::kBrowserProcessExecutableName);
23 return reinterpret_cast<GetUploadedReportsPointer>(
24 exe_module ? GetProcAddress(exe_module, "GetUploadedReportsImpl")
25 : nullptr);
26 }();
27
28 if (get_uploaded_reports) {
29 const crash_reporter::UploadedReport* reports;
30 size_t report_count;
31 get_uploaded_reports(&reports, &report_count);
32 *uploaded_reports = std::vector<crash_reporter::UploadedReport>(
33 reports, reports + report_count);
34 }
35 }
36 #endif // OS_WIN
37
38 } // namespace
39
11 CrashUploadListCrashpad::CrashUploadListCrashpad( 40 CrashUploadListCrashpad::CrashUploadListCrashpad(
12 Delegate* delegate, 41 Delegate* delegate,
13 const base::FilePath& upload_log_path,
14 const scoped_refptr<base::SequencedWorkerPool>& worker_pool) 42 const scoped_refptr<base::SequencedWorkerPool>& worker_pool)
15 : CrashUploadList(delegate, upload_log_path, worker_pool) {} 43 : CrashUploadList(delegate, base::FilePath(), worker_pool) {}
16 44
17 CrashUploadListCrashpad::~CrashUploadListCrashpad() {} 45 CrashUploadListCrashpad::~CrashUploadListCrashpad() {}
18 46
19 void CrashUploadListCrashpad::LoadUploadList() { 47 void CrashUploadListCrashpad::LoadUploadList() {
20 std::vector<crash_reporter::UploadedReport> uploaded_reports; 48 std::vector<crash_reporter::UploadedReport> uploaded_reports;
49 #if defined(OS_WIN)
50 // On Windows, we only link crash client into chrome.exe (not the dlls), and
51 // it does the registration. That means the global that holds the crash report
52 // database lives in the .exe, so we need to grab a pointer to a helper in the
53 // exe to get our uploaded reports list.
54 GetUploadedReportsThunk(&uploaded_reports);
55 #else
21 crash_reporter::GetUploadedReports(&uploaded_reports); 56 crash_reporter::GetUploadedReports(&uploaded_reports);
57 #endif
22 58
23 ClearUploads(); 59 ClearUploads();
24 for (const crash_reporter::UploadedReport& uploaded_report : 60 for (const crash_reporter::UploadedReport& uploaded_report :
25 uploaded_reports) { 61 uploaded_reports) {
26 AppendUploadInfo( 62 AppendUploadInfo(
27 UploadInfo(uploaded_report.remote_id, 63 UploadInfo(uploaded_report.remote_id,
28 base::Time::FromTimeT(uploaded_report.creation_time), 64 base::Time::FromTimeT(uploaded_report.creation_time),
29 uploaded_report.local_id, base::Time())); 65 uploaded_report.local_id, base::Time()));
30 } 66 }
31 } 67 }
OLDNEW
« no previous file with comments | « chrome/browser/crash_upload_list_crashpad.h ('k') | chrome/browser_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698