notification balloons: Remove views and cocoa implementations of BalloonCollection.

chrome/browser/notifications/balloon_collection_impl.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 "chrome/browser/notifications/balloon_collection_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 13 matching lines @@
 // 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;
 
 // The spacing between the balloon and the panel.
 const int kVerticalSpacingBetweenBalloonAndPanel = 5;
 
-#if USE_OFFSETS
 // Delay from the mouse leaving the balloon collection before
 // there is a relayout, in milliseconds.
 const int kRepositionDelayMs = 300;
-#endif  // USE_OFFSETS
 
 
 BalloonCollectionImpl::BalloonCollectionImpl()
-#if USE_OFFSETS
     : reposition_factory_(this),
-      added_as_message_loop_observer_(false)
-#endif
-{
+      added_as_message_loop_observer_(false) {
   registrar_.Add(this, chrome::NOTIFICATION_PANEL_COLLECTION_UPDATED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
                  content::NotificationService::AllSources());
 
   SetPositionPreference(BalloonCollection::DEFAULT_POSITION);
 }
 
 BalloonCollectionImpl::~BalloonCollectionImpl() {
-#if USE_OFFSETS
   RemoveMessageLoopObserver();
-#endif
 }
 
 void BalloonCollectionImpl::AddImpl(const Notification& notification,
                                     Profile* profile,
                                     bool add_to_front) {
   Balloon* new_balloon = MakeBalloon(notification, profile);
   // The +1 on width is necessary because width is fixed on notifications,
   // so since we always have the max size, we would always hit the scrollbar
   // condition.  We are only interested in comparing height to maximum.
   new_balloon->set_min_scrollbar_size(gfx::Size(1 + layout_.max_balloon_width(),
                                                 layout_.max_balloon_height()));
   new_balloon->SetPosition(layout_.OffScreenLocation(), false);
   new_balloon->Show();
-#if USE_OFFSETS
   int count = base_.count();
   if (count > 0 && layout_.RequiresOffsets())
     new_balloon->set_offset(base_.balloons()[count - 1]->offset());
-#endif
   base_.Add(new_balloon, add_to_front);
   PositionBalloons(false);
 
   // There may be no listener in a unit test.
   if (space_change_listener_)
     space_change_listener_->OnBalloonSpaceChanged();
 
   // This is used only for testing.
   if (!on_collection_changed_callback_.is_null())
     on_collection_changed_callback_.Run();
@@ skipping 45 matching lines @@
   balloon->set_content_size(Layout::ConstrainToSizeLimits(size));
   PositionBalloons(true);
 }
 
 void BalloonCollectionImpl::DisplayChanged() {
   layout_.RefreshSystemMetrics();
   PositionBalloons(true);
 }
 
 void BalloonCollectionImpl::OnBalloonClosed(Balloon* source) {
-#if USE_OFFSETS
   // We want to free the balloon when finished.
   const Balloons& balloons = base_.balloons();
 
   Balloons::const_iterator it = balloons.begin();
   if (layout_.RequiresOffsets()) {
     gfx::Vector2d offset;
     bool apply_offset = false;
     while (it != balloons.end()) {
       if (*it == source) {
         ++it;
         if (it != balloons.end()) {
           apply_offset = true;
           offset.set_y((source)->offset().y() - (*it)->offset().y() +
               (*it)->content_size().height() - source->content_size().height());
         }
       } else {
         if (apply_offset)
           (*it)->add_offset(offset);
         ++it;
       }
     }
     // Start listening for UI events so we cancel the offset when the mouse
     // leaves the balloon area.
     if (apply_offset)
       AddMessageLoopObserver();
   }
-#endif
 
   base_.Remove(source);
   PositionBalloons(true);
 
   // There may be no listener in a unit test.
   if (space_change_listener_)
     space_change_listener_->OnBalloonSpaceChanged();
 
   // This is used only for testing.
   if (!on_collection_changed_callback_.is_null())
@@ skipping 45 matching lines @@
   Balloons::const_iterator iter;
   for (iter = balloons.begin(); iter != balloons.end(); ++iter) {
     gfx::Rect balloon_box = gfx::Rect((*iter)->GetPosition(),
                                       (*iter)->GetViewSize());
     bounds.Union(balloon_box);
   }
 
   return bounds;
 }
 
-#if USE_OFFSETS
 void BalloonCollectionImpl::AddMessageLoopObserver() {
   if (!added_as_message_loop_observer_) {
     base::MessageLoopForUI::current()->AddObserver(this);
     added_as_message_loop_observer_ = true;
   }
 }
 
 void BalloonCollectionImpl::RemoveMessageLoopObserver() {
   if (added_as_message_loop_observer_) {
     base::MessageLoopForUI::current()->RemoveObserver(this);
@@ skipping 25 matching lines @@
           FROM_HERE,
           base::Bind(&BalloonCollectionImpl::CancelOffsets,
                      reposition_factory_.GetWeakPtr()),
           base::TimeDelta::FromMilliseconds(kRepositionDelayMs));
     }
   } else {
     // Mouse moved back into the region.  Cancel the reposition.
     reposition_factory_.InvalidateWeakPtrs();
   }
 }
-#endif
 
 BalloonCollectionImpl::Layout::Layout()
     : placement_(INVALID),
       need_to_compute_panel_offset_(false),
       offset_to_move_above_panels_(0) {
   RefreshSystemMetrics();
 }
 
 void BalloonCollectionImpl::Layout::GetMaxLinearSize(int* max_balloon_size,
                                                      int* total_size) const {
@@ skipping 93 matching lines @@
       break;
   }
   return location;
 }
 
 bool BalloonCollectionImpl::Layout::RequiresOffsets() const {
   // Layout schemes that grow up from the bottom require offsets;
   // schemes that grow down do not require offsets.
   bool offsets = (placement_ == VERTICALLY_FROM_BOTTOM_LEFT ||
                   placement_ == VERTICALLY_FROM_BOTTOM_RIGHT);
-
-#if defined(OS_MACOSX)
-  // These schemes are in screen-coordinates, and top and bottom
-  // are inverted on Mac.
-  offsets = !offsets;
-#endif
-
   return offsets;
 }
 
 // static
 gfx::Size BalloonCollectionImpl::Layout::ConstrainToSizeLimits(
     const gfx::Size& size) {
   // restrict to the min & max sizes
   return gfx::Size(
       std::max(min_balloon_width(),
                std::min(max_balloon_width(), size.width())),
@@ skipping 51 matching lines @@
   if (offset_to_move_above_panels_ == offset_to_move_above_panels)
     return false;
 
   offset_to_move_above_panels_ = offset_to_move_above_panels;
   return true;
 }
 
 bool BalloonCollectionImpl::Layout::RefreshSystemMetrics() {
   bool changed = false;
 
-#if defined(OS_MACOSX)
-  gfx::Rect new_work_area = GetMacWorkArea();
-#else
   // TODO(scottmg): NativeScreen is wrong. http://crbug.com/133312
   gfx::Rect new_work_area =
       gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().work_area();
-#endif
   if (work_area_ != 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;
 }