Fix the settings button and UMA metrics for the message center

ui/message_center/views/message_popup_collection.cc

 // Copyright (c) 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 "ui/message_center/views/message_popup_collection.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 104 matching lines @@
 }
 
 void MessagePopupCollection::ClickOnNotificationButton(
     const std::string& notification_id,
     int button_index) {
   message_center_->ClickOnNotificationButton(notification_id, button_index);
 }
 
 void MessagePopupCollection::ClickOnSettingsButton(
     const std::string& notification_id) {
-  tray_->ShowNotifierSettingsBubble();
+  message_center_->ClickOnSettingsButton(notification_id);
 }
 
 void MessagePopupCollection::UpdateNotificationSize(
     const std::string& notification_id) {
   OnNotificationUpdated(notification_id);
 }
 
 void MessagePopupCollection::MarkAllPopupsShown() {
   std::set<std::string> closed_ids = CloseAllWidgets();
   for (std::set<std::string>::iterator iter = closed_ids.begin();
@@ skipping 428 matching lines @@
       views::Widget* widget = (*iter)->GetWidget();
       if (widget)
         return widget->GetWindowBoundsInScreen();
       break;
     }
   }
   return gfx::Rect();
 }
 
 }  // namespace message_center