chrome_frame/chrome_active_document.cc - Issue 6933035: Revert 84284 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt...

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_active_document.cc

Issue 6933035: Revert 84284 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 8 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 side-by-side diff with in-line comments

Download patch

Index: chrome_frame/chrome_active_document.cc

===================================================================

--- chrome_frame/chrome_active_document.cc (revision 84291)

+++ chrome_frame/chrome_active_document.cc (working copy)

@@ -66,7 +66,7 @@

is_automation_client_reused_(false),

popup_allowed_(false),

accelerator_table_(NULL) {

- TRACE_EVENT_BEGIN_ETW("chromeframe.createactivedocument", this, "");

+ TRACE_EVENT_BEGIN("chromeframe.createactivedocument", this, "");

url_fetcher_->set_frame_busting(false);

memset(navigation_info_.get(), 0, sizeof(NavigationInfo));

@@ -133,7 +133,7 @@

// ChromeFramePlugin

BaseActiveX::Uninitialize();

- TRACE_EVENT_END_ETW("chromeframe.createactivedocument", this, "");

+ TRACE_EVENT_END("chromeframe.createactivedocument", this, "");

}

// Override DoVerb

« no previous file with comments | « chrome/common/sandbox_policy.cc ('k') | chrome_frame/chrome_frame_activex.cc » ('j') | no next file with comments »