Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3409)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/app/client_util.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:
View side-by-side diff with in-line comments
Download patch
« base/debug/trace_event.cc ('K') | « base/debug/trace_event_win_unittest.cc ('k') | chrome/browser/automation/automation_provider.cc » ('j') | content/common/child_trace_message_filter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/client_util.cc
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index 8eaf0bf3821e65b20be742adb8087be8186ea32c..55f3d8cfc1d9da7f2d5274a75f32794853bf7c21 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -130,9 +130,9 @@ HMODULE LoadChromeWithDirectory(std::wstring* dir) {
key.Close();
}
if (pre_read) {
- TRACE_EVENT_BEGIN("PreReadImage", 0, "");
+ TRACE_EVENT_BEGIN_ETW("PreReadImage", 0, "");
file_util::PreReadImage(dir->c_str(), pre_read_size, pre_read_step_size);
- TRACE_EVENT_END("PreReadImage", 0, "");
+ TRACE_EVENT_END_ETW("PreReadImage", 0, "");
}
}
#endif // NDEBUG
« base/debug/trace_event.cc ('K') | « base/debug/trace_event_win_unittest.cc ('k') | chrome/browser/automation/automation_provider.cc » ('j') | content/common/child_trace_message_filter.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698