Remove the most obvious dead code from message center.

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/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 11 matching lines @@
 #include "grit/ui_strings.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_center_tray_delegate.h"
 #include "ui/message_center/message_center_util.h"
 #include "ui/message_center/views/message_bubble_base.h"
 #include "ui/message_center/views/message_center_bubble.h"
-#include "ui/message_center/views/message_popup_bubble.h"
 #include "ui/message_center/views/message_popup_collection.h"
 #include "ui/views/bubble/tray_bubble_view.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 
 #if defined(OS_CHROMEOS)
 
 namespace message_center {
@@ skipping 142 matching lines @@
   SetVisible(false);
   message_center_tray_.reset(new message_center::MessageCenterTray(
       this,
       message_center::MessageCenter::Get()));
   OnMessageCenterTrayChanged();
 }
 
 WebNotificationTray::~WebNotificationTray() {
   // Release any child views that might have back pointers before ~View().
   message_center_bubble_.reset();
-  popup_bubble_.reset();
   popup_collection_.reset();
 }
 
 // Public methods.
 
 bool WebNotificationTray::ShowMessageCenterInternal(bool show_settings) {
   if (!ShouldShowMessageCenter())
     return false;
 
   should_block_shelf_auto_hide_ = true;
@@ skipping 59 matching lines @@
   else
     message_center_tray_->ShowPopupBubble();
 }
 
 bool WebNotificationTray::ShowPopups() {
   if (status_area_widget()->login_status() == user::LOGGED_IN_LOCKED ||
       message_center_bubble() ||
       !status_area_widget()->ShouldShowWebNotifications()) {
     return false;
   }
-  if (message_center::IsRichNotificationEnabled()) {
-    // No bubble wrappers here, since |popup_collection_| is not a bubble but a
-    // collection of widgets.
-    popup_collection_.reset(new message_center::MessagePopupCollection(
-        ash::Shell::GetContainer(
-            GetWidget()->GetNativeView()->GetRootWindow(),
-            internal::kShellWindowId_StatusContainer),
-        message_center(),
-        message_center_tray_.get()));
-  } else {
-    message_center::MessagePopupBubble* popup_bubble =
-        new message_center::MessagePopupBubble(message_center());
-    popup_bubble_.reset(new internal::WebNotificationBubbleWrapper(
-        this, popup_bubble));
-  }
+
+  popup_collection_.reset(new message_center::MessagePopupCollection(
+      ash::Shell::GetContainer(
+          GetWidget()->GetNativeView()->GetRootWindow(),
+          internal::kShellWindowId_StatusContainer),
+      message_center(),
+      message_center_tray_.get()));
+
   return true;
 }
 
-void WebNotificationTray::UpdatePopups() {
-  if (popup_bubble())
-    popup_bubble()->bubble()->ScheduleUpdate();
-};
-
 void WebNotificationTray::HidePopups() {
-  popup_bubble_.reset();
   popup_collection_.reset();
 }
 
 // Private methods.
 
 bool WebNotificationTray::ShouldShowMessageCenter() {
   return status_area_widget()->login_status() != user::LOGGED_IN_LOCKED &&
       !(status_area_widget()->system_tray() &&
         status_area_widget()->system_tray()->HasNotificationBubble());
 }
@@ skipping 48 matching lines @@
 bool WebNotificationTray::ShouldBlockLauncherAutoHide() const {
   return should_block_shelf_auto_hide_;
 }
 
 bool WebNotificationTray::IsMessageCenterBubbleVisible() const {
   return (message_center_bubble() &&
           message_center_bubble()->bubble()->IsVisible());
 }
 
 bool WebNotificationTray::IsMouseInNotificationBubble() const {
-  if (!popup_bubble())
-    return false;
-  return popup_bubble()->bubble_view()->GetBoundsInScreen().Contains(
-      Shell::GetScreen()->GetCursorScreenPoint());
+  return false;
 }
 
 void WebNotificationTray::ShowMessageCenterBubble() {
   if (!IsMessageCenterBubbleVisible())
     message_center_tray_->ShowMessageCenterBubble();
 }
 
 void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {
   if (alignment == shelf_alignment())
     return;
   internal::TrayBackgroundView::SetShelfAlignment(alignment);
   tray_container()->set_border(NULL);
   // Destroy any existing bubble so that it will be rebuilt correctly.
   message_center_tray_->HideMessageCenterBubble();
   message_center_tray_->HidePopupBubble();
 }
 
 void WebNotificationTray::AnchorUpdated() {
-  if (popup_bubble()) {
-    popup_bubble()->bubble_view()->UpdateBubble();
-    // Ensure that the notification buble is above the launcher/status area.
-    popup_bubble()->bubble_view()->GetWidget()->StackAtTop();
-    UpdateBubbleViewArrow(popup_bubble()->bubble_view());
-  }
   if (message_center_bubble()) {
     message_center_bubble()->bubble_view()->UpdateBubble();
     UpdateBubbleViewArrow(message_center_bubble()->bubble_view());
   }
 }
 
 base::string16 WebNotificationTray::GetAccessibleNameForTray() {
   return l10n_util::GetStringUTF16(
       IDS_MESSAGE_CENTER_ACCESSIBLE_NAME);
 }
 
 void WebNotificationTray::HideBubbleWithView(
     const views::TrayBubbleView* bubble_view) {
   if (message_center_bubble() &&
       bubble_view == message_center_bubble()->bubble_view()) {
     message_center_tray_->HideMessageCenterBubble();
-  } else if ((popup_bubble() && bubble_view == popup_bubble()->bubble_view()) ||
-             popup_collection_.get()) {
+  } else if (popup_collection_.get()) {
     message_center_tray_->HidePopupBubble();
   }
 }
 
 bool WebNotificationTray::PerformAction(const ui::Event& event) {
   if (ShouldShowQuietModeMenu(event)) {
     ShowQuietModeMenu(event);
     return true;
   }
 
   if (message_center_bubble())
     message_center_tray_->HideMessageCenterBubble();
   else
     message_center_tray_->ShowMessageCenterBubble();
   return true;
 }
 
 void WebNotificationTray::BubbleViewDestroyed() {
   if (message_center_bubble())
     message_center_bubble()->bubble()->BubbleViewDestroyed();
-  if (popup_bubble())
-    popup_bubble()->bubble()->BubbleViewDestroyed();
 }
 
-void WebNotificationTray::OnMouseEnteredView() {
-  if (popup_bubble())
-    popup_bubble()->bubble()->OnMouseEnteredView();
-}
+void WebNotificationTray::OnMouseEnteredView() {}
 
-void WebNotificationTray::OnMouseExitedView() {
-  if (popup_bubble())
-    popup_bubble()->bubble()->OnMouseExitedView();
-}
+void WebNotificationTray::OnMouseExitedView() {}
 
 base::string16 WebNotificationTray::GetAccessibleNameForBubble() {
   return GetAccessibleNameForTray();
 }
 
 gfx::Rect WebNotificationTray::GetAnchorRect(
     views::Widget* anchor_widget,
     views::TrayBubbleView::AnchorType anchor_type,
     views::TrayBubbleView::AnchorAlignment anchor_alignment) {
   return GetBubbleAnchorRect(anchor_widget, anchor_type, anchor_alignment);
@@ skipping 67 matching lines @@
 }
 
 message_center::MessageCenterBubble*
 WebNotificationTray::GetMessageCenterBubbleForTest() {
   if (!message_center_bubble())
     return NULL;
   return static_cast<message_center::MessageCenterBubble*>(
       message_center_bubble()->bubble());
 }
 
-message_center::MessagePopupBubble*
-WebNotificationTray::GetPopupBubbleForTest() {
-  if (!popup_bubble())
-    return NULL;
-  return static_cast<message_center::MessagePopupBubble*>(
-      popup_bubble()->bubble());
-}
-
 }  // namespace ash