diff options
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/chrome_active_document.cc | 4 | ||||
-rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 4 | ||||
-rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 98c4d76..0a9d3a9 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -66,7 +66,7 @@ ChromeActiveDocument::ChromeActiveDocument() is_automation_client_reused_(false), popup_allowed_(false), accelerator_table_(NULL) { - TRACE_EVENT_BEGIN("chromeframe.createactivedocument", this, ""); + TRACE_EVENT_BEGIN_ETW("chromeframe.createactivedocument", this, ""); url_fetcher_->set_frame_busting(false); memset(navigation_info_.get(), 0, sizeof(NavigationInfo)); @@ -133,7 +133,7 @@ ChromeActiveDocument::~ChromeActiveDocument() { // ChromeFramePlugin BaseActiveX::Uninitialize(); - TRACE_EVENT_END("chromeframe.createactivedocument", this, ""); + TRACE_EVENT_END_ETW("chromeframe.createactivedocument", this, ""); } // Override DoVerb diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index 62bae43..425cc2f 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, diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 6024972..f0ccbe4 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -129,7 +129,7 @@ ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl( AutomationProxyCacheEntry* entry, std::string channel_id, int launch_timeout) : AutomationProxy(launch_timeout, false), proxy_entry_(entry) { - TRACE_EVENT_BEGIN("chromeframe.automationproxy", this, ""); + TRACE_EVENT_BEGIN_ETW("chromeframe.automationproxy", this, ""); InitializeChannel(channel_id, false); @@ -142,7 +142,7 @@ ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl( } ChromeFrameAutomationProxyImpl::~ChromeFrameAutomationProxyImpl() { - TRACE_EVENT_END("chromeframe.automationproxy", this, ""); + TRACE_EVENT_END_ETW("chromeframe.automationproxy", this, ""); } void ChromeFrameAutomationProxyImpl::SendAsAsync( @@ -354,7 +354,7 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, AUTOMATION_CREATE_TAB_FAILED + 1); } - TRACE_EVENT_END("chromeframe.createproxy", this, ""); + TRACE_EVENT_END_ETW("chromeframe.createproxy", this, ""); // Finally set the proxy. proxy_.reset(proxy); @@ -467,7 +467,7 @@ ProxyFactory::~ProxyFactory() { void ProxyFactory::GetAutomationServer( LaunchDelegate* delegate, ChromeFrameLaunchParams* params, void** automation_server_id) { - TRACE_EVENT_BEGIN("chromeframe.createproxy", this, ""); + TRACE_EVENT_BEGIN_ETW("chromeframe.createproxy", this, ""); scoped_refptr<AutomationProxyCacheEntry> entry; // Find already existing launcher thread for given profile |