Commit 88326687 authored by Daniel Bratell's avatar Daniel Bratell Committed by Commit Bot

Jumbo build fix: Use unique names of constants in message_center

A recent CL got rid of the shared constants and instead copied
them to relevant files. To work in jumbo builds they must then
have unique names.

(The alternative to find a shared location for the constants
seems not applicable in this case)

Bug: 783018,723882
Change-Id: I8e64dcf56bfe74d30279549291e89bdec80bc3d2
Reviewed-on: https://chromium-review.googlesource.com/905304
Commit-Queue: Daniel Bratell <bratell@opera.com>
Commit-Queue: Mostyn Bramley-Moore <mostynb@vewd.com>
Reviewed-by: default avatarEvan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534793}
parent 4d37dc96
...@@ -119,10 +119,10 @@ constexpr int kMessageViewWidth = ...@@ -119,10 +119,10 @@ constexpr int kMessageViewWidth =
kLeftContentPadding.right() - kContentRowPadding.left() - kLeftContentPadding.right() - kContentRowPadding.left() -
kContentRowPadding.right(); kContentRowPadding.right();
const int kMinPixelsPerTitleCharacter = 4; const int kMinPixelsPerTitleCharacterMD = 4;
// Character limit = pixels per line * line limit / min. pixels per character. // Character limit = pixels per line * line limit / min. pixels per character.
constexpr size_t kMessageCharacterLimit = constexpr size_t kMessageCharacterLimitMD =
kNotificationWidth * kMessageExpandedLineLimit / 3; kNotificationWidth * kMessageExpandedLineLimit / 3;
// The default is 12, so this normally come out to 13. // The default is 12, so this normally come out to 13.
...@@ -854,7 +854,7 @@ void NotificationViewMD::CreateOrUpdateTitleView( ...@@ -854,7 +854,7 @@ void NotificationViewMD::CreateOrUpdateTitleView(
} }
int title_character_limit = int title_character_limit =
kNotificationWidth * kMaxTitleLines / kMinPixelsPerTitleCharacter; kNotificationWidth * kMaxTitleLines / kMinPixelsPerTitleCharacterMD;
base::string16 title = gfx::TruncateString( base::string16 title = gfx::TruncateString(
notification.title(), title_character_limit, gfx::WORD_BREAK); notification.title(), title_character_limit, gfx::WORD_BREAK);
...@@ -882,7 +882,7 @@ void NotificationViewMD::CreateOrUpdateMessageView( ...@@ -882,7 +882,7 @@ void NotificationViewMD::CreateOrUpdateMessageView(
} }
base::string16 text = gfx::TruncateString( base::string16 text = gfx::TruncateString(
notification.message(), kMessageCharacterLimit, gfx::WORD_BREAK); notification.message(), kMessageCharacterLimitMD, gfx::WORD_BREAK);
const gfx::FontList& font_list = GetTextFontList(); const gfx::FontList& font_list = GetTextFontList();
......
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