Merge 98618 - [chromeos] Do not move notifications to KEEP_SIZE state when mouse moved.

chrome/browser/chromeos/notifications/notification_panel.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.
 
 // Draws the view for the balloons.
 
 #include "chrome/browser/chromeos/notifications/notification_panel.h"
 
 #include <algorithm>
 
@@ skipping 633 matching lines @@
 
 void NotificationPanel::OnMouseLeave() {
   SetActiveView(NULL);
   if (balloon_container_->GetNotificationCount() == 0)
     SET_STATE(CLOSED);
   UpdatePanel(true);
 }
 
 void NotificationPanel::OnMouseMotion(const gfx::Point& point) {
   SetActiveView(balloon_container_->FindBalloonView(point));
-  SET_STATE(KEEP_SIZE);
   // We need to set the focus to scroll view to get mouse wheel
   // working. Setting focus when mouse moves on the panel
   // because focus may be taken by other view.
   scroll_view_->RequestFocus();
+  // This method used to set KEEP_SIZE state. However,
+  // some html notifications may want to change their size,
+  // and setting KEEP_SIZE caused them to behave differently
+  // depending on whether user moved mouse over notification
+  // or not.
 }
 
 NotificationPanelTester* NotificationPanel::GetTester() {
   if (!tester_.get())
     tester_.reset(new NotificationPanelTester(this));
   return tester_.get();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NotificationPanel private.
@@ skipping 193 matching lines @@
                                   &origin);
   return rect.Contains(gfx::Rect(origin, view->size()));
 }
 
 
 bool NotificationPanelTester::IsActive(const BalloonViewImpl* view) const {
   return panel_->active_ == view;
 }
 
 }  // namespace chromeos