Commit 1cc3eead authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Gave two kBubbleReshowsHistogramName unique names

In jumbo builds many cc files are compiled together in the same
translation unit. When that happens, those files will share the
same anonymous namespace so if they use symbols of the same name
they will clash.

That happened with two kBubbleReshowsHistogramName constants in
chrome/browser/ui/exclusive_access and this patch gives
those two more unique names.

Bug: 803406
Change-Id: I2b8e3a060c7b7853a3a001317e80d32b7d6e56d4
Reviewed-on: https://chromium-review.googlesource.com/980879
Commit-Queue: Yuri Wiitala <miu@chromium.org>
Reviewed-by: default avatarYuri Wiitala <miu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#546239}
parent ae5b22e3
...@@ -46,7 +46,7 @@ using content::WebContents; ...@@ -46,7 +46,7 @@ using content::WebContents;
namespace { namespace {
const char kBubbleReshowsHistogramName[] = const char kFullscreenBubbleReshowsHistogramName[] =
"ExclusiveAccess.BubbleReshowsPerSession.Fullscreen"; "ExclusiveAccess.BubbleReshowsPerSession.Fullscreen";
} // namespace } // namespace
...@@ -330,7 +330,8 @@ void FullscreenController::NotifyTabExclusiveAccessLost() { ...@@ -330,7 +330,8 @@ void FullscreenController::NotifyTabExclusiveAccessLost() {
void FullscreenController::RecordBubbleReshowsHistogram( void FullscreenController::RecordBubbleReshowsHistogram(
int bubble_reshow_count) { int bubble_reshow_count) {
UMA_HISTOGRAM_COUNTS_100(kBubbleReshowsHistogramName, bubble_reshow_count); UMA_HISTOGRAM_COUNTS_100(kFullscreenBubbleReshowsHistogramName,
bubble_reshow_count);
} }
void FullscreenController::ToggleFullscreenModeInternal( void FullscreenController::ToggleFullscreenModeInternal(
......
...@@ -24,7 +24,7 @@ using content::WebContents; ...@@ -24,7 +24,7 @@ using content::WebContents;
namespace { namespace {
const char kBubbleReshowsHistogramName[] = const char kMouseLockBubbleReshowsHistogramName[] =
"ExclusiveAccess.BubbleReshowsPerSession.MouseLock"; "ExclusiveAccess.BubbleReshowsPerSession.MouseLock";
} // namespace } // namespace
...@@ -103,7 +103,8 @@ void MouseLockController::NotifyTabExclusiveAccessLost() { ...@@ -103,7 +103,8 @@ void MouseLockController::NotifyTabExclusiveAccessLost() {
void MouseLockController::RecordBubbleReshowsHistogram( void MouseLockController::RecordBubbleReshowsHistogram(
int bubble_reshow_count) { int bubble_reshow_count) {
UMA_HISTOGRAM_COUNTS_100(kBubbleReshowsHistogramName, bubble_reshow_count); UMA_HISTOGRAM_COUNTS_100(kMouseLockBubbleReshowsHistogramName,
bubble_reshow_count);
} }
bool MouseLockController::HandleUserPressedEscape() { bool MouseLockController::HandleUserPressedEscape() {
......
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