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

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 1936093003: Fix gpu_video_decode_accelerator include order by renaming enum with X11 name collision (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename Status->ThreadStatus Created 4 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
Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 2b0b0633d38214028d652ae62d2ac1924af98fc2..16e3e006f45d50231bd9b535758277174c25bde2 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -943,7 +943,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
std::string flag =
parsed_command_line().GetSwitchValueASCII(switches::kEnableProfiling);
// Default to basic profiling (no parent child support).
- tracked_objects::ThreadData::Status status =
+ tracked_objects::ThreadData::ThreadStatus status =
tracked_objects::ThreadData::PROFILING_ACTIVE;
if (flag.compare("0") != 0)
status = tracked_objects::ThreadData::DEACTIVATED;

Powered by Google App Engine
This is Rietveld 408576698