chrome/browser/automation/automation_provider_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/automation/automation_provider_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/automation/automation_provider_win.cc

diff --git a/chrome/browser/automation/automation_provider_win.cc b/chrome/browser/automation/automation_provider_win.cc

index c764004bfa9ce7288fb8987a7ce5bf2e460c7f66..0a11a497f7374114e357d48d287072c49588016d 100644

--- a/chrome/browser/automation/automation_provider_win.cc

+++ b/chrome/browser/automation/automation_provider_win.cc

@@ -233,7 +233,7 @@ void AutomationProvider::CreateExternalTab(

const ExternalTabSettings& settings,

gfx::NativeWindow* tab_container_window, gfx::NativeWindow* tab_window,

int* tab_handle, int* session_id) {

- TRACE_EVENT_BEGIN("AutomationProvider::CreateExternalTab", 0, "");

+ TRACE_EVENT_BEGIN_ETW("AutomationProvider::CreateExternalTab", 0, "");

*tab_handle = 0;

*tab_container_window = NULL;

@@ -263,7 +263,7 @@ void AutomationProvider::CreateExternalTab(

external_tab_container->Uninitialize();

}

- TRACE_EVENT_END("AutomationProvider::CreateExternalTab", 0, "");

+ TRACE_EVENT_END_ETW("AutomationProvider::CreateExternalTab", 0, "");

}

bool AutomationProvider::AddExternalTab(ExternalTabContainer* external_tab) {

@@ -374,7 +374,7 @@ void AutomationProvider::ConnectExternalTab(

gfx::NativeWindow* tab_window,

int* tab_handle,

int* session_id) {

- TRACE_EVENT_BEGIN("AutomationProvider::ConnectExternalTab", 0, "");

+ TRACE_EVENT_BEGIN_ETW("AutomationProvider::ConnectExternalTab", 0, "");

*tab_handle = 0;

*tab_container_window = NULL;

@@ -401,7 +401,7 @@ void AutomationProvider::ConnectExternalTab(

external_tab_container->Uninitialize();

}

- TRACE_EVENT_END("AutomationProvider::ConnectExternalTab", 0, "");

+ TRACE_EVENT_END_ETW("AutomationProvider::ConnectExternalTab", 0, "");

}

void AutomationProvider::OnBrowserMoved(int tab_handle) {