Change some desktop notifications layout parameters to be per-platform rather...

chrome/browser/notifications/balloon_collection.cc

 // Copyright (c) 2010 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.h"
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/window_sizer.h"
 
 namespace {
 
 // Portion of the screen allotted for notifications. When notification balloons
 // extend over this, no new notifications are shown until some are closed.
 const double kPercentBalloonFillFactor = 0.7;
 
 // Allow at least this number of balloons on the screen.
 const int kMinAllowedBalloonCount = 2;
 
-// Margin from the edge of the work area
-const int kVerticalEdgeMargin = 5;
-const int kHorizontalEdgeMargin = 5;
-
-// Space between balloons.
-const int kInterBalloonMargin = 5;
-
 }  // namespace
 
 // static
-#if defined(OS_MACOSX)
-BalloonCollectionImpl::Layout::Placement
-    BalloonCollectionImpl::Layout::placement_ =
-        Layout::VERTICALLY_FROM_TOP_RIGHT;
-#else
+// Note that on MacOS, since the coordinate system is inverted vertically from
+// the others, this actually produces notifications coming from the TOP right,
+// which is what is desired.
 BalloonCollectionImpl::Layout::Placement
     BalloonCollectionImpl::Layout::placement_ =
         Layout::VERTICALLY_FROM_BOTTOM_RIGHT;
-#endif
 
 BalloonCollectionImpl::BalloonCollectionImpl()
     : space_change_listener_(NULL) {
 }
 
 BalloonCollectionImpl::~BalloonCollectionImpl() {
   STLDeleteElements(&balloons_);
 }
 
 void BalloonCollectionImpl::Add(const Notification& notification,
@@ skipping 95 matching lines @@
       NOTREACHED();
       break;
   }
 }
 
 gfx::Point BalloonCollectionImpl::Layout::GetLayoutOrigin() const {
   int x = 0;
   int y = 0;
   switch (placement_) {
     case HORIZONTALLY_FROM_BOTTOM_LEFT:
-      x = work_area_.x() + kHorizontalEdgeMargin;
-      y = work_area_.bottom() - kVerticalEdgeMargin;
+      x = work_area_.x() + HorizontalEdgeMargin();
+      y = work_area_.bottom() - VerticalEdgeMargin();
       break;
     case HORIZONTALLY_FROM_BOTTOM_RIGHT:
-      x = work_area_.right() - kHorizontalEdgeMargin;
-      y = work_area_.bottom() - kVerticalEdgeMargin;
+      x = work_area_.right() - HorizontalEdgeMargin();
+      y = work_area_.bottom() - VerticalEdgeMargin();
       break;
     case VERTICALLY_FROM_TOP_RIGHT:
-      x = work_area_.right() - kHorizontalEdgeMargin;
-      y = work_area_.y() + kVerticalEdgeMargin;
+      x = work_area_.right() - HorizontalEdgeMargin();
+      y = work_area_.y() + VerticalEdgeMargin();
       break;
     case VERTICALLY_FROM_BOTTOM_RIGHT:
-      x = work_area_.right() - kHorizontalEdgeMargin;
-      y = work_area_.bottom() - kVerticalEdgeMargin;
+      x = work_area_.right() - HorizontalEdgeMargin();
+      y = work_area_.bottom() - VerticalEdgeMargin();
       break;
     default:
       NOTREACHED();
       break;
   }
   return gfx::Point(x, y);
 }
 
 gfx::Point BalloonCollectionImpl::Layout::NextPosition(
     const gfx::Size& balloon_size,
     gfx::Point* position_iterator) const {
   DCHECK(position_iterator);
 
   int x = 0;
   int y = 0;
   switch (placement_) {
     case HORIZONTALLY_FROM_BOTTOM_LEFT:
       x = position_iterator->x();
       y = position_iterator->y() - balloon_size.height();
       position_iterator->set_x(position_iterator->x() + balloon_size.width() +
-                               kInterBalloonMargin);
+                               InterBalloonMargin());
       break;
     case HORIZONTALLY_FROM_BOTTOM_RIGHT:
       position_iterator->set_x(position_iterator->x() - balloon_size.width() -
-                               kInterBalloonMargin);
+                               InterBalloonMargin());
       x = position_iterator->x();
       y = position_iterator->y() - balloon_size.height();
       break;
     case VERTICALLY_FROM_TOP_RIGHT:
       x = position_iterator->x() - balloon_size.width();
       y = position_iterator->y();
       position_iterator->set_y(position_iterator->y() + balloon_size.height() +
-                               kInterBalloonMargin);
+                               InterBalloonMargin());
       break;
     case VERTICALLY_FROM_BOTTOM_RIGHT:
       position_iterator->set_y(position_iterator->y() - balloon_size.height() -
-                               kInterBalloonMargin);
+                               InterBalloonMargin());
       x = position_iterator->x() - balloon_size.width();
       y = position_iterator->y();
       break;
     default:
       NOTREACHED();
       break;
   }
   return gfx::Point(x, y);
 }
 
 bool BalloonCollectionImpl::Layout::RefreshSystemMetrics() {
   bool changed = false;
 
   scoped_ptr<WindowSizer::MonitorInfoProvider> info_provider(
       WindowSizer::CreateDefaultMonitorInfoProvider());
 
   gfx::Rect new_work_area = info_provider->GetPrimaryMonitorWorkArea();
   if (!work_area_.Equals(new_work_area)) {
     work_area_.SetRect(new_work_area.x(), new_work_area.y(),
                        new_work_area.width(), new_work_area.height());
     changed = true;
   }
 
   return changed;
 }