Remove static initialization from the panels code.

chrome/browser/ui/panels/panel_browser_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/panels/panel_browser_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/webui/task_manager_dialog.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 // This value is experimental and subjective.
 const int kSetBoundsAnimationMs = 180;
 
 // The threshold to differentiate the short click and long click.
-const base::TimeDelta kShortClickThresholdMs =
-    base::TimeDelta::FromMilliseconds(200);
+const int kShortClickThresholdMs = 200;
 
 // Delay before click-to-minimize is allowed after the attention has been
 // cleared.
-const base::TimeDelta kSuspendMinimizeOnClickIntervalMs =
-    base::TimeDelta::FromMilliseconds(500);
+const int kSuspendMinimizeOnClickIntervalMs = 500;
 
 }
 
 NativePanel* Panel::CreateNativePanel(Browser* browser, Panel* panel,
                                       const gfx::Rect& bounds) {
   PanelBrowserView* view = new PanelBrowserView(browser, panel, bounds);
   (new BrowserFrame(view))->InitBrowserFrame();
   return view;
 }
 
@@ skipping 389 matching lines @@
 
   // If the panel drag was cancelled before the mouse is released, do not treat
   // this as a click.
   if (mouse_dragging_state_ != NO_DRAGGING)
     return true;
 
   // Do not minimize the panel when we just clear the attention state. This is
   // a hack to prevent the panel from being minimized when the user clicks on
   // the title-bar to clear the attention.
   if (panel_->expansion_state() == Panel::EXPANDED &&
-      base::TimeTicks::Now() < attention_cleared_time_ +
-                               kSuspendMinimizeOnClickIntervalMs) {
+      base::TimeTicks::Now() - attention_cleared_time_ <
+      base::TimeDelta::FromMilliseconds(kSuspendMinimizeOnClickIntervalMs)) {
     return true;
   }
 
   // Do not minimize the panel if it is long click.
-  if (base::TimeTicks::Now() - mouse_pressed_time_ > kShortClickThresholdMs)
+  if (base::TimeTicks::Now() - mouse_pressed_time_ >
+      base::TimeDelta::FromMilliseconds(kShortClickThresholdMs))
     return true;
 
   Panel::ExpansionState new_expansion_state =
     (panel_->expansion_state() != Panel::EXPANDED) ? Panel::EXPANDED
                                                    : Panel::MINIMIZED;
   panel_->SetExpansionState(new_expansion_state);
   return true;
 }
 
 bool PanelBrowserView::OnTitlebarMouseCaptureLost() {
@@ skipping 95 matching lines @@
 }
 
 bool NativePanelTestingWin::IsWindowSizeKnown() const {
   return true;
 }
 
 bool NativePanelTestingWin::IsAnimatingBounds() const {
   return panel_browser_view_->bounds_animator_.get() &&
          panel_browser_view_->bounds_animator_->is_animating();
 }