Re-factor Ash Message Center code part 2/4

ash/system/tray/system_tray.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 "ash/system/tray/system_tray.h"
 
 #include "ash/shell.h"
 #include "ash/shell/panel_window.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/tray_volume.h"
@@ skipping 36 matching lines @@
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 // SystemTray
 
 using internal::SystemTrayBubble;
-using internal::TrayBubbleView;
 
 SystemTray::SystemTray(internal::StatusAreaWidget* status_area_widget)
     : internal::TrayBackgroundView(status_area_widget),
       items_(),
       accessibility_observer_(NULL),
       audio_observer_(NULL),
       bluetooth_observer_(NULL),
       brightness_observer_(NULL),
       caps_lock_observer_(NULL),
       clock_observer_(NULL),
@@ skipping 195 matching lines @@
 void SystemTray::DestroyBubble() {
   bubble_.reset();
   detailed_item_ = NULL;
 }
 
 void SystemTray::DestroyNotificationBubble() {
   notification_bubble_.reset();
   status_area_widget()->SetHideWebNotifications(false);
 }
 
-void SystemTray::RemoveBubble(SystemTrayBubble* bubble) {

[stevenjb, 2012/10/11 17:15:15]

Renamed HideBubble and moved below

-  if (bubble == bubble_.get()) {
-    DestroyBubble();
-    UpdateNotificationBubble();  // State changed, re-create notifications.
-    Shell::GetInstance()->shelf()->UpdateAutoHideState();
-  } else if (bubble == notification_bubble_) {
-    DestroyNotificationBubble();
-  } else {
-    NOTREACHED();
-  }
-}
-
 int SystemTray::GetTrayXOffset(SystemTrayItem* item) const {
   // Don't attempt to align the arrow if the shelf is on the left or right.
   if (shelf_alignment() != SHELF_ALIGNMENT_BOTTOM)
     return TrayBubbleView::InitParams::kArrowDefaultOffset;
 
   std::map<SystemTrayItem*, views::View*>::const_iterator it =
       tray_item_map_.find(item);
   if (it == tray_item_map_.end())
     return TrayBubbleView::InitParams::kArrowDefaultOffset;
 
@@ skipping 29 matching lines @@
   notification_bubble_.reset();
 
   if (bubble_.get() && creation_type == BUBBLE_USE_EXISTING) {
     bubble_->UpdateView(items, bubble_type);
   } else {
     bubble_.reset(new SystemTrayBubble(this, items, bubble_type));
     ash::SystemTrayDelegate* delegate =
         ash::Shell::GetInstance()->tray_delegate();
     views::View* anchor = tray_container();
     TrayBubbleView::InitParams init_params(TrayBubbleView::ANCHOR_TYPE_TRAY,
-                                           shelf_alignment());
+                                           GetAnchorAlignment(),
+                                           kTrayPopupWidth);
     init_params.can_activate = can_activate;
     if (detailed) {
       // This is the case where a volume control or brightness control bubble
       // is created.
       init_params.max_height = default_bubble_height_;
       init_params.top_color = kBackgroundColor;
       init_params.arrow_color = kBackgroundColor;
     } else {
       init_params.top_color = kBackgroundColor;
       init_params.arrow_color = kHeaderBackgroundColorDark;
     }
     init_params.arrow_offset = arrow_offset;
-    bubble_->InitView(anchor, init_params, delegate->GetUserLoginStatus());
+    bubble_->InitView(anchor, delegate->GetUserLoginStatus(), &init_params);
   }
   // Save height of default view for creating detailed views directly.
   if (!detailed)
     default_bubble_height_ = bubble_->bubble_view()->height();
 
   if (detailed && items.size() > 0)
     detailed_item_ = items[0];
   else
     detailed_item_ = NULL;
 
@@ skipping 34 matching lines @@
   }
   views::View* anchor;
   TrayBubbleView::AnchorType anchor_type;
   if (bubble_.get()) {
     anchor = bubble_->bubble_view();
     anchor_type = TrayBubbleView::ANCHOR_TYPE_BUBBLE;
   } else {
     anchor = tray_container();
     anchor_type = TrayBubbleView::ANCHOR_TYPE_TRAY;
   }
-  TrayBubbleView::InitParams init_params(anchor_type, shelf_alignment());
+  TrayBubbleView::InitParams init_params(anchor_type,
+                                         GetAnchorAlignment(),
+                                         kTrayPopupWidth);
   init_params.top_color = kBackgroundColor;
   init_params.arrow_color = kBackgroundColor;
   init_params.arrow_offset = GetTrayXOffset(notification_items_[0]);
   user::LoginStatus login_status =
       Shell::GetInstance()->tray_delegate()->GetUserLoginStatus();
-  notification_bubble_->InitView(anchor, init_params, login_status);
+  notification_bubble_->InitView(anchor, login_status, &init_params);
   if (notification_bubble_->bubble_view()->child_count() == 0) {
     // It is possible that none of the items generated actual notifications.
     DestroyNotificationBubble();
     return;
   }
   if (hide_notifications_)
     notification_bubble_->SetVisible(false);
   else
     status_area_widget()->SetHideWebNotifications(true);
 }
@@ skipping 24 matching lines @@
     notification_bubble_->bubble_view()->GetWidget()->StackAtTop();
   }
   if (bubble_.get())
     bubble_->bubble_view()->UpdateBubble();
 }
 
 string16 SystemTray::GetAccessibleName() {
   return l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_ACCESSIBLE_NAME);
 }
 
+void SystemTray::HideBubble(TrayBubbleView* bubble_view) {

[miket_OOO, 2012/10/12 19:53:59]

It's weird that this parameter could be const, but that appears to be the case.
That said, I don't think it should be.

[stevenjb, 2012/10/12 20:39:28]

Actually, you're right, it is weird, and I think I will change the function to
HideBubbleWithView() and make bubble_view const.

+  if (bubble_.get() && bubble_view == bubble_->bubble_view()) {
+    DestroyBubble();
+    UpdateNotificationBubble();  // State changed, re-create notifications.
+    Shell::GetInstance()->shelf()->UpdateAutoHideState();
+  } else if (notification_bubble_.get() &&
+             bubble_view == notification_bubble_->bubble_view()) {
+    DestroyNotificationBubble();
+  }
+}
+
+bool SystemTray::ClickedOutsideBubble() {
+  if (!bubble_.get() ||
+      bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_NOTIFICATION) {
+    return false;
+  }
+  HideBubble(bubble_->bubble_view());
+  return true;
+}
+
 bool SystemTray::PerformAction(const ui::Event& event) {
   // If we're already showing the default view, hide it; otherwise, show it
   // (and hide any popup that's currently shown).
   if (bubble_.get() &&
       bubble_->bubble_type() == SystemTrayBubble::BUBBLE_TYPE_DEFAULT) {
     bubble_->Close();
   } else {
     int arrow_offset = TrayBubbleView::InitParams::kArrowDefaultOffset;
     if (event.IsMouseEvent() || event.type() == ui::ET_GESTURE_TAP) {
       const ui::LocatedEvent& located_event =
           static_cast<const ui::LocatedEvent&>(event);
       if (shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) {
         gfx::Point point(located_event.x(), 0);
         ConvertPointToWidget(this, &point);
         arrow_offset = point.x();
       }
     }
     ShowDefaultViewWithOffset(BUBBLE_CREATE_NEW, arrow_offset);
   }
   return true;
 }
 
 }  // namespace ash