Remove static initializer for kOriginTotalDuration.

Looks like this snuck in while the static initialization scripts
got moved around and we didn't notice the regression.

Bug: 94925
Change-Id: I35b597cc4cd6b4607306ab242f8594f3eba3d0c0
Reviewed-on: https://chromium-review.googlesource.com/c/1293550Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601548}

chrome/browser/ui/views/frame/hosted_app_button_container.cc

@@ -77,8 +77,14 @@ constexpr base::TimeDelta HostedAppButtonContainer::kTitlebarAnimationDelay;
 constexpr base::TimeDelta HostedAppButtonContainer::kOriginFadeInDuration;
 constexpr base::TimeDelta HostedAppButtonContainer::kOriginPauseDuration;
 constexpr base::TimeDelta HostedAppButtonContainer::kOriginFadeOutDuration;
-const base::TimeDelta HostedAppButtonContainer::kOriginTotalDuration =
-    kOriginFadeInDuration + kOriginPauseDuration + kOriginFadeOutDuration;
+
+// static
+base::TimeDelta HostedAppButtonContainer::OriginTotalDuration() {
+  // TimeDelta.operator+ uses time_internal::SaturatedAdd() which isn't
+  // constexpr, so this needs to be a function to not introduce a static
+  // initializer.
+  return kOriginFadeInDuration + kOriginPauseDuration + kOriginFadeOutDuration;
+}
 
 class HostedAppButtonContainer::ContentSettingsContainer : public views::View {
  public:
@@ -405,7 +411,7 @@ void HostedAppButtonContainer::StartTitlebarAnimation() {
   hosted_app_origin_text_->StartFadeAnimation();
   app_menu_button_->StartHighlightAnimation();
   icon_fade_in_delay_.Start(
-      FROM_HERE, kOriginTotalDuration, this,
+      FROM_HERE, OriginTotalDuration(), this,
       &HostedAppButtonContainer::FadeInContentSettingIcons);
 }
 

chrome/browser/ui/views/frame/hosted_app_button_container.h

@@ -58,7 +58,7 @@ class HostedAppButtonContainer : public views::AccessiblePaneView,
       base::TimeDelta::FromMilliseconds(800);
 
   // The total duration of the origin fade animation.
-  static const base::TimeDelta kOriginTotalDuration;
+  static base::TimeDelta OriginTotalDuration();
 
   // |active_color| and |inactive_color| indicate the colors to use
   // for button icons when the window is focused and blurred respectively.

chrome/browser/ui/views/frame/hosted_app_origin_text.cc

@@ -86,7 +86,7 @@ void HostedAppOriginText::StartFadeAnimation() {
       FROM_HERE,
       base::BindOnce(&HostedAppOriginText::AnimationComplete,
                      weak_factory_.GetWeakPtr()),
-      HostedAppButtonContainer::kOriginTotalDuration);
+      HostedAppButtonContainer::OriginTotalDuration());
 
   NotifyAccessibilityEvent(ax::mojom::Event::kValueChanged, true);
 }