ash: Fix setting the tray-widget size when tray-view for date changes.

ash/system/date/date_view.cc

 // Copyright (c) 2012 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 "ash/system/date/date_view.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/tray_constants.h"
 #include "base/time.h"
@@ skipping 44 matching lines @@
 }  // namespace
 
 BaseDateTimeView::~BaseDateTimeView() {
   timer_.Stop();
 }
 
 void BaseDateTimeView::UpdateText() {
   base::Time now = base::Time::Now();
   gfx::Size old_size = GetPreferredSize();
   UpdateTextInternal(now);
-  if (GetWidget() && GetPreferredSize() != old_size) {
-    // Forcing the widget to the new size is sufficient. The positioning is
-    // taken care of by the layout manager (ShelfLayoutManager).
-    GetWidget()->SetSize(GetPreferredSize());
-  }
   SchedulePaint();
 
   // Try to set the timer to go off at the next change of the minute. We don't
   // want to have the timer go off more than necessary since that will cause
   // the CPU to wake up and consume power.
   base::Time::Exploded exploded;
   now.LocalExplode(&exploded);
 
   // Often this will be called at minute boundaries, and we'll actually want
   // 60 seconds from now.
   int seconds_left = 60 - exploded.second;
   if (seconds_left == 0)
     seconds_left = 60;
 
   // Make sure that the timer fires on the next minute. Without this, if it is
   // called just a teeny bit early, then it will skip the next minute.
   seconds_left += kTimerSlopSeconds;
 
   timer_.Stop();
   timer_.Start(
       FROM_HERE, base::TimeDelta::FromSeconds(seconds_left),
       this, &BaseDateTimeView::UpdateText);
 }
 
 BaseDateTimeView::BaseDateTimeView() {
 }
 
+void BaseDateTimeView::ChildPreferredSizeChanged(views::View* child) {
+  views::View::PreferredSizeChanged();
+  if (GetWidget())
+    GetWidget()->SetSize(GetWidget()->GetContentsView()->GetPreferredSize());
+}
+
 void BaseDateTimeView::OnLocaleChanged() {
   UpdateText();
 }
 
 DateView::DateView() : actionable_(false) {
   SetLayoutManager(
       new views::BoxLayout(
           views::BoxLayout::kVertical, 0, 0, kTrayPopupTextSpacingVertical));
   date_label_ = CreateLabel();
   day_of_week_label_ = CreateLabel();
@@ skipping 51 matching lines @@
 }
 
 bool TimeView::PerformAction(const views::Event& event) {
   return false;
 }
 
 
 }  // namespace tray
 }  // namespace internal
 }  // namespace ash