diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 21:10:43 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-13 21:10:43 +0000 |
| commit | ba1821ceea9c8c40b15c80d62463b57ed2612cad (patch) | |
| tree | 514aceaa2b7f1ab10dcdb0741b4d436bf0e3c137 /ui/message_center | |
| parent | 714e4e934ec0757651ea0257262e2b29bfb03f1c (diff) | |
| download | chromium_src-ba1821ceea9c8c40b15c80d62463b57ed2612cad.zip chromium_src-ba1821ceea9c8c40b15c80d62463b57ed2612cad.tar.gz chromium_src-ba1821ceea9c8c40b15c80d62463b57ed2612cad.tar.bz2 | |
Remove 4 static initializers on linux.
clang doesn't need static initializers for TimeDeltas, but gcc does. This
accounts for 2 initializers. Also move two constants to the header which are
used in the initialization of other constants ("const int kB = kA + 10"). This
accounts for the other 2 (one of them being introduced in the aura switch.)
BUG=317171,94925
R=erg@chromium.org
Review URL: https://codereview.chromium.org/61643020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234901 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center')
| -rw-r--r-- | ui/message_center/message_center_style.cc | 5 | ||||
| -rw-r--r-- | ui/message_center/message_center_style.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/ui/message_center/message_center_style.cc b/ui/message_center/message_center_style.cc index 4d23322..5b40016 100644 --- a/ui/message_center/message_center_style.cc +++ b/ui/message_center/message_center_style.cc @@ -47,11 +47,6 @@ const size_t kNotificationMaximumItems = 5; const int kAutocloseDefaultDelaySeconds = 8; const int kAutocloseHighPriorityDelaySeconds = 25; -// Around notifications //////////////////////////////////////////////////////// - -// Pixel dimensions. -const int kMarginBetweenItems = 10; - // Colors. const SkColor kBackgroundLightColor = SkColorSetRGB(0xf1, 0xf1, 0xf1); const SkColor kBackgroundDarkColor = SkColorSetRGB(0xe7, 0xe7, 0xe7); diff --git a/ui/message_center/message_center_style.h b/ui/message_center/message_center_style.h index 18d74f5..6227da5 100644 --- a/ui/message_center/message_center_style.h +++ b/ui/message_center/message_center_style.h @@ -112,9 +112,8 @@ const int kContextMessageLineLimit = 1; // Around notifications //////////////////////////////////////////////////////// // DIP dimensions (H = horizontal, V = vertical). -MESSAGE_CENTER_EXPORT extern const int kMarginBetweenItems; // H & V space - // around & between - // notifications. +const int kMarginBetweenItems = 10; // H & V space around & between + // notifications. // Colors. extern const SkColor kBackgroundLightColor; // Behind notifications, gradient |