Fix the problem that notifications and panels overlap.

chrome/browser/notifications/balloon_collection_views.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/notifications/balloon_collection_impl.h"
 
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/ui/views/notifications/balloon_view.h"
 #include "ui/base/events.h"
 #include "ui/gfx/rect.h"
@@ skipping 13 matching lines @@
 }
 
 int BalloonCollectionImpl::Layout::HorizontalEdgeMargin() const {
   return 2;
 }
 
 int BalloonCollectionImpl::Layout::VerticalEdgeMargin() const {
   return 0;
 }
 
+gfx::Point BalloonCollectionImpl::Layout::GetLayoutOrigin() const {
+  int x = 0;
+  int y = 0;
+  switch (placement_) {
+    case VERTICALLY_FROM_TOP_LEFT:
+      x = work_area_.x() + HorizontalEdgeMargin();
+      y = work_area_.y() + VerticalEdgeMargin();
+      break;
+    case VERTICALLY_FROM_TOP_RIGHT:
+      x = work_area_.right() - HorizontalEdgeMargin();
+      y = work_area_.y() + VerticalEdgeMargin();
+      break;
+    case VERTICALLY_FROM_BOTTOM_LEFT:
+      x = work_area_.x() + HorizontalEdgeMargin();
+      // For this placement, balloon needs to stay on top of left-most panels
+      // to avoid overlapping.
+      y = work_area_.bottom() - VerticalEdgeMargin() -
+          bottom_left_offset_to_move_above_panels_;
+      break;
+    case VERTICALLY_FROM_BOTTOM_RIGHT:
+      x = work_area_.right() - HorizontalEdgeMargin();
+      // For this placement, balloon needs to stay on top of right-most panels
+      // to avoid overlapping.
+      y = work_area_.bottom() - VerticalEdgeMargin() -
+          bottom_right_offset_to_move_above_panels_;
+      break;
+    default:
+      NOTREACHED();
+      break;
+  }
+  return gfx::Point(x, y);
+}
+
 void BalloonCollectionImpl::PositionBalloons(bool reposition) {
   PositionBalloonsInternal(reposition);
 }
 
 base::EventStatus BalloonCollectionImpl::WillProcessEvent(
     const base::NativeEvent& event) {
   return base::EVENT_CONTINUE;
 }
 
 void BalloonCollectionImpl::DidProcessEvent(const base::NativeEvent& event) {
@@ skipping 52 matching lines @@
   else
     NOTREACHED();
 
   PositionBalloons(true);
 }
 
 // static
 BalloonCollection* BalloonCollection::Create() {
   return new BalloonCollectionImpl();
 }