Separate the logic of popup alignment and workarea handling as delegate.

chrome/browser/ui/views/message_center/web_notification_tray.cc

 // Copyright 2013 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/ui/views/message_center/web_notification_tray.h"
 
 #include "base/i18n/number_formatting.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_icon_menu_model.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/message_center/message_center_tray.h"
 #include "ui/message_center/message_center_tray_delegate.h"
+#include "ui/message_center/views/desktop_popup_alignment_delegate.h"
 #include "ui/message_center/views/message_popup_collection.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 // Tray constants
 const int kScreenEdgePadding = 2;
 
 // Number of pixels the message center is offset from the mouse.
 const int kMouseOffset = 5;
@@ skipping 88 matching lines @@
 }
 
 WebNotificationTray::WebNotificationTray(PrefService* local_state)
     : message_center_delegate_(NULL),
       status_icon_(NULL),
       status_icon_menu_(NULL),
       should_update_tray_content_(true) {
   message_center_tray_.reset(
       new MessageCenterTray(this, g_browser_process->message_center()));
   last_quiet_mode_state_ = message_center()->IsQuietMode();
+  alignment_delegate_.reset(new message_center::DesktopPopupAlignmentDelegate);
   popup_collection_.reset(new message_center::MessagePopupCollection(
-      NULL, message_center(), message_center_tray_.get(), false));
+      NULL, message_center(), message_center_tray_.get(),
+      alignment_delegate_.get()));
 
 #if defined(OS_WIN)
   // |local_state| can be NULL in tests.
   if (local_state) {
     did_force_tray_visible_.reset(new BooleanPrefMember());
     did_force_tray_visible_->Init(prefs::kMessageCenterForcedOnTaskbar,
                                   local_state);
   }
 #endif
   title_ = l10n_util::GetStringFUTF16(
       IDS_MESSAGE_CENTER_FOOTER_WITH_PRODUCT_TITLE,
       l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
 }
 
 WebNotificationTray::~WebNotificationTray() {
   // Reset this early so that delegated events during destruction don't cause
   // problems.
   popup_collection_.reset();
   message_center_tray_.reset();
   DestroyStatusIcon();
 }
 
 message_center::MessageCenter* WebNotificationTray::message_center() {
   return message_center_tray_->message_center();
 }
 
 bool WebNotificationTray::ShowPopups() {
+  alignment_delegate_->StartObserving(gfx::Screen::GetNativeScreen());
   popup_collection_->DoUpdateIfPossible();
   return true;
 }
 
 void WebNotificationTray::HidePopups() {
   DCHECK(popup_collection_.get());
   popup_collection_->MarkAllPopupsShown();
 }
 
 bool WebNotificationTray::ShowMessageCenter() {
@@ skipping 213 matching lines @@
   status_icon_menu_ = menu.get();
   status_icon->SetContextMenu(menu.Pass());
 }
 
 MessageCenterWidgetDelegate*
 WebNotificationTray::GetMessageCenterWidgetDelegateForTest() {
   return message_center_delegate_;
 }
 
 }  // namespace message_center