chrome_frame/chrome_frame_activex.cc - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

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

Unified Diff: chrome_frame/chrome_frame_activex.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 years, 7 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:

Index: chrome_frame/chrome_frame_activex.cc

diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc

index 62bae43bd60e8a1691ad8ae8356e8321a08e3259..425cc2f5091d14b79e86e92416841f93dc0ba2ae 100644

--- a/chrome_frame/chrome_frame_activex.cc

+++ b/chrome_frame/chrome_frame_activex.cc

@@ -148,7 +148,7 @@ void GetMiniContextMenuData(UINT cmd,

ChromeFrameActivex::ChromeFrameActivex()

: chrome_wndproc_hook_(NULL) {

- TRACE_EVENT_BEGIN("chromeframe.createactivex", this, "");

+ TRACE_EVENT_BEGIN_ETW("chromeframe.createactivex", this, "");

}

HRESULT ChromeFrameActivex::FinalConstruct() {

@@ -177,7 +177,7 @@ ChromeFrameActivex::~ChromeFrameActivex() {

// ChromeFramePlugin::Uninitialize()

Base::Uninitialize();

- TRACE_EVENT_END("chromeframe.createactivex", this, "");

+ TRACE_EVENT_END_ETW("chromeframe.createactivex", this, "");

}

LRESULT ChromeFrameActivex::OnCreate(UINT message, WPARAM wparam, LPARAM lparam,