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

Unified Diff: base/tracked_objects.h

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
« no previous file with comments | « no previous file | base/tracked_objects.cc » ('j') | media/gpu/ipc/service/gpu_video_decode_accelerator.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/tracked_objects.h
diff --git a/base/tracked_objects.h b/base/tracked_objects.h
index 168b17db045a429234c3ae403622a9217adf3ad8..52312f3ead2ca50c925adadea2d0af3a49e36324 100644
--- a/base/tracked_objects.h
+++ b/base/tracked_objects.h
@@ -437,7 +437,7 @@ class BASE_EXPORT ThreadData {
public:
// Current allowable states of the tracking system. The states can vary
// between ACTIVE and DEACTIVATED, but can never go back to UNINITIALIZED.
- enum Status {
+ enum ThreadStatus {
UNINITIALIZED, // Pristine, link-time state before running.
DORMANT_DURING_TESTS, // Only used during testing.
DEACTIVATED, // No longer recording profiling.
@@ -519,9 +519,9 @@ class BASE_EXPORT ThreadData {
// Sets internal status_.
// If |status| is false, then status_ is set to DEACTIVATED.
// If |status| is true, then status_ is set to PROFILING_ACTIVE.
- static void InitializeAndSetTrackingStatus(Status status);
+ static void InitializeAndSetTrackingStatus(ThreadStatus status);
- static Status status();
+ static ThreadStatus status();
// Indicate if any sort of profiling is being done (i.e., we are more than
// DEACTIVATED).
« no previous file with comments | « no previous file | base/tracked_objects.cc » ('j') | media/gpu/ipc/service/gpu_video_decode_accelerator.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698