Commit 78d61deb authored by Leonard Grey's avatar Leonard Grey Committed by Commit Bot

[Mac stack sampler] Indicate profiler is supported on dev

Collapsed the Windows and Mac paths since they're now the same logic,
but happy to do it the other way if that's better.

Bug: 531673
Change-Id: Iff49448d82115bb651ba00626dc33ab19d23c3b8
Reviewed-on: https://chromium-review.googlesource.com/695568Reviewed-by: default avatarMike Wittman <wittman@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Leonard Grey <lgrey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#505739}
parent 82795d97
......@@ -24,7 +24,7 @@ base::LazyInstance<StackSamplingConfiguration>::Leaky g_configuration =
// The profiler is currently only implemented for Windows x64 and Mac x64.
bool IsProfilerSupported() {
#if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
#if (defined(OS_WIN) && defined(ARCH_CPU_X86_64)) || defined(OS_MACOSX)
#if defined(GOOGLE_CHROME_BUILD)
// Only run on canary and dev.
const version_info::Channel channel = chrome::GetChannel();
......@@ -33,13 +33,6 @@ bool IsProfilerSupported() {
#else
return true;
#endif
#elif defined(OS_MACOSX)
// Only run on canary for now.
#if defined(GOOGLE_CHROME_BUILD)
return chrome::GetChannel() == version_info::Channel::CANARY;
#else
return true;
#endif
#else
return false;
#endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment