Show extension settings for extension notifications

ash/system/web_notification/web_notification_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/web_notification/web_notification_tray.h"
 
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 144 matching lines @@
     if (iter == notifications_.end())
       return false;
     EraseNotification(iter);
     return true;
   }
 
   void RemoveAllNotifications() {
     notifications_.clear();
   }
 
-  void RemoveNotificationsBySource(const std::string& id) {
+  void SendRemoveNotificationsBySource(WebNotificationTray* tray,
+                                       const std::string& id) {
     Notifications::iterator source_iter = GetNotification(id);
     if (source_iter == notifications_.end())
       return;
     string16 display_source = source_iter->display_source;
     for (Notifications::iterator loopiter = notifications_.begin();
          loopiter != notifications_.end(); ) {
       Notifications::iterator curiter = loopiter++;
       if (curiter->display_source == display_source)
-        EraseNotification(curiter);
+        tray->SendRemoveNotification(curiter->id);
     }
   }
 
-  void RemoveNotificationsByExtension(const std::string& id) {
+  void SendRemoveNotificationsByExtension(WebNotificationTray* tray,
+                                          const std::string& id) {
     Notifications::iterator source_iter = GetNotification(id);
     if (source_iter == notifications_.end())
       return;
     std::string extension_id = source_iter->extension_id;
     for (Notifications::iterator loopiter = notifications_.begin();
          loopiter != notifications_.end(); ) {
       Notifications::iterator curiter = loopiter++;
       if (curiter->extension_id == extension_id)
-        EraseNotification(curiter);
+        tray->SendRemoveNotification(curiter->id);
     }
   }
 
   bool SetNotificationImage(const std::string& id,
                             const gfx::ImageSkia& image) {
     Notifications::iterator iter = GetNotification(id);
     if (iter == notifications_.end())
       return false;
     iter->image = image;
     return true;
@@ skipping 250 matching lines @@
                              const ui::Event& event) OVERRIDE {
     if (sender == close_button_)
       tray_->SendRemoveNotification(notification_.id);
   }
 
   // Overridden from MenuButtonListener.
   virtual void OnMenuButtonClicked(
       View* source, const gfx::Point& point) OVERRIDE {
     if (source != menu_button_)
       return;
+    tray_->set_menu_open(true);

[sadrul, 2012/08/13 22:09:08]

This feels like a hack. The app-list controller does this slightly differently:
if a click happens in the menu-container window, then the click doesn't close
the bubble (https://chromiumcodereview.appspot.com/10831024/). Perhaps we can do
the same in TrayBubbleView::Host::ProcessLocatedEvent?

[stevenjb, 2012/08/14 00:48:37]

Sure. I'm not a huge fan of using globals, but at least it has the advantage
that it will work in the system tray if we add any menus to it.
Done.

     WebNotificationMenuModel menu_model(tray_, notification_);
     views::MenuModelAdapter menu_model_adapter(&menu_model);
     views::MenuRunner menu_runner(menu_model_adapter.CreateMenu());
 
     gfx::Point screen_location;
     views::View::ConvertPointToScreen(menu_button_, &screen_location);
     ignore_result(menu_runner.RunMenuAt(
         source->GetWidget()->GetTopLevelWidget(),
         menu_button_,
         gfx::Rect(screen_location, menu_button_->size()),
         views::MenuItemView::TOPRIGHT,
         views::MenuRunner::HAS_MNEMONICS));
+    tray_->set_menu_open(false);
   }
 
  private:
   WebNotificationTray* tray_;
   WebNotification notification_;
   views::ImageView* icon_;
   views::MenuButton* menu_button_;
   views::ImageButton* close_button_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationView);
@@ skipping 289 matching lines @@
   virtual void OnMouseEnteredView() OVERRIDE {
     StopAutoCloseTimer();
   }
 
   virtual void OnMouseExitedView() OVERRIDE {
     StartAutoCloseTimer();
   }
 
   virtual void OnClickedOutsideView() OVERRIDE {
     // May delete |this|.
-    tray_->HideMessageCenterBubble();
+    if (!tray_->menu_open())
+      tray_->HideMessageCenterBubble();
   }
 
   // Overridden from views::WidgetObserver:
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE {
     CHECK_EQ(bubble_widget_, widget);
     bubble_widget_ = NULL;
     tray_->HideBubble(this);  // Will destroy |this|.
   }
 
  private:
@@ skipping 31 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(Bubble);
 };
 
 WebNotificationTray::WebNotificationTray(
     internal::StatusAreaWidget* status_area_widget)
     : internal::TrayBackgroundView(status_area_widget),
       notification_list_(new WebNotificationList()),
       count_label_(NULL),
       delegate_(NULL),
-      show_message_center_on_unlock_(false) {
+      show_message_center_on_unlock_(false),
+      menu_open_(false) {
   count_label_ = new views::Label(UTF8ToUTF16("0"));
   internal::SetupLabelForTray(count_label_);
   gfx::Font font = count_label_->font();
   count_label_->SetFont(font.DeriveFont(0, font.GetStyle() & ~gfx::Font::BOLD));
   count_label_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
   count_label_->SetEnabledColor(kMessageCountDimmedColor);
 
   tray_container()->set_size(gfx::Size(kTrayWidth, kTrayHeight));
   tray_container()->AddChildView(count_label_);
 
@@ skipping 145 matching lines @@
       std::string notification_id = curiter->id;
       // May call RemoveNotification and erase curiter.
       delegate_->NotificationRemoved(notification_id);
     }
   }
 }
 
 // When we disable notifications, we remove any existing matching
 // notifications to avoid adding complicated UI to re-enable the source.
 void WebNotificationTray::DisableByExtension(const std::string& id) {
-  // Will call SendRemoveNotification for each matching notification.
-  notification_list_->RemoveNotificationsByExtension(id);
   if (delegate_)
     delegate_->DisableExtension(id);
+  // Will call SendRemoveNotification for each matching notification.
+  notification_list_->SendRemoveNotificationsByExtension(this, id);
 }
 
 void WebNotificationTray::DisableByUrl(const std::string& id) {
-  // Will call SendRemoveNotification for each matching notification.
-  notification_list_->RemoveNotificationsBySource(id);
   if (delegate_)
     delegate_->DisableNotificationsFromSource(id);
+  // Will call SendRemoveNotification for each matching notification.
+  notification_list_->SendRemoveNotificationsBySource(this, id);
 }
 
 bool WebNotificationTray::PerformAction(const ui::Event& event) {
   if (message_center_bubble())
     HideMessageCenterBubble();
   else
     ShowMessageCenterBubble();
   return true;
 }
 
@@ skipping 45 matching lines @@
   } else if (bubble == notification_bubble()) {
     HideNotificationBubble();
   }
 }
 
 bool WebNotificationTray::HasNotificationForTest(const std::string& id) const {
   return notification_list_->HasNotification(id);
 }
 
 }  // namespace ash