chrome/browser/external_tab_container_win.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/browser/external_tab_container_win.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/browser/external_tab_container_win.cc

diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc

index b8625fec81edcc46ee85026b79d38f458f446bc2..9e5e83d58a76ef70c467558450e3231c5e00272e 100644

--- a/chrome/browser/external_tab_container_win.cc

+++ b/chrome/browser/external_tab_container_win.cc

@@ -730,8 +730,8 @@ void ExternalTabContainer::Observe(NotificationType type,

const LoadNotificationDetails* load =

Details<LoadNotificationDetails>(details).ptr();

if (load != NULL && PageTransition::IsMainFrame(load->origin())) {

- TRACE_EVENT_END("ExternalTabContainer::Navigate", 0,

- load->url().spec());

+ TRACE_EVENT_END_ETW("ExternalTabContainer::Navigate", 0,

+ load->url().spec());

automation_->Send(new AutomationMsg_TabLoaded(tab_handle_,

load->url()));

}

@@ -980,7 +980,7 @@ void ExternalTabContainer::Navigate(const GURL& url, const GURL& referrer) {

return;

}

- TRACE_EVENT_BEGIN("ExternalTabContainer::Navigate", 0, url.spec());

+ TRACE_EVENT_BEGIN_ETW("ExternalTabContainer::Navigate", 0, url.spec());

tab_contents_->controller().LoadURL(url, referrer,

PageTransition::START_PAGE);