chrome/common/child_process_logging_win.cc - Issue 1023783005: Merge Crashpad to the 42.0.2311 branch

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/common/child_process_logging_win.cc

Issue 1023783005: Merge Crashpad to the 42.0.2311 branch (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@2311

Patch Set: Created 5 years, 9 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

« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | chrome/common/chrome_paths.cc » ('j') | no next file with comments »

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/common/child_process_logging.h"	5 #include "chrome/common/child_process_logging.h"

6	6

7 #include <windows.h>	7 #include <windows.h>

8	8

9 #include "base/debug/crash_logging.h"	9 #include "base/debug/crash_logging.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
67 base::debug::SetCrashKeyReportingFunctions(	67 base::debug::SetCrashKeyReportingFunctions(

68 &SetCrashKeyValueTrampoline, &ClearCrashKeyValueTrampoline);	68 &SetCrashKeyValueTrampoline, &ClearCrashKeyValueTrampoline);

69	69

70 // This would be handled by BreakpadClient::SetCrashClientIdFromGUID(), but	70 // This would be handled by BreakpadClient::SetCrashClientIdFromGUID(), but

71 // because of the aforementioned issue, crash keys aren't ready yet at the	71 // because of the aforementioned issue, crash keys aren't ready yet at the

72 // time of Breakpad initialization, load the client id backed up in Google	72 // time of Breakpad initialization, load the client id backed up in Google

73 // Update settings instead.	73 // Update settings instead.

74 scoped_ptr<metrics::ClientInfo> client_info =	74 scoped_ptr<metrics::ClientInfo> client_info =

75 GoogleUpdateSettings::LoadMetricsClientInfo();	75 GoogleUpdateSettings::LoadMetricsClientInfo();

76 if (client_info)	76 if (client_info)

77 crash_keys::SetCrashClientIdFromGUID(client_info->client_id);	77 crash_keys::SetMetricsClientIdFromGUID(client_info->client_id);

78 }	78 }

79	79

80 } // namespace child_process_logging	80 } // namespace child_process_logging

OLD	NEW