Re-factor Ash Message Center code part 2/4

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/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 332 matching lines @@
   }
   if (popup_bubble()) {
     if (notification_list_->notifications().size() == 0)
       HidePopupBubble();
     else
       popup_bubble()->ScheduleUpdate();
   }
   UpdateTray();
 }
 
-void WebNotificationTray::HideBubble(WebNotificationBubble* bubble) {
-  if (bubble == message_center_bubble()) {
+void WebNotificationTray::HideBubbleWithView(
+    const TrayBubbleView* bubble_view) {
+  if (message_center_bubble() &&
+      bubble_view == message_center_bubble()->bubble_view()) {
     HideMessageCenterBubble();
-  } else if (bubble == popup_bubble()) {
+  } else if (popup_bubble() && bubble_view == popup_bubble()->bubble_view()) {
     HidePopupBubble();
   }
 }
 
+bool WebNotificationTray::ClickedOutsideBubble() {
+  // Only hide the message center.
+  if (!message_center_bubble())
+    return false;
+  HideMessageCenterBubble();
+  return true;
+}
+
 // Methods for testing
 
 size_t WebNotificationTray::GetNotificationCountForTest() const {
   return notification_list_->notifications().size();
 }
 
 bool WebNotificationTray::HasNotificationForTest(const std::string& id) const {
   return notification_list_->HasNotification(id);
 }
 
 void WebNotificationTray::RemoveAllNotificationsForTest() {
   notification_list_->RemoveAllNotifications();
 }
 
 size_t WebNotificationTray::GetMessageCenterNotificationCountForTest() const {
   if (!message_center_bubble())
     return 0;
   return message_center_bubble()->NumMessageViewsForTest();
 }
 
 size_t WebNotificationTray::GetPopupNotificationCountForTest() const {
   if (!popup_bubble())
     return 0;
   return popup_bubble()->NumMessageViewsForTest();
 }
 
 }  // namespace ash