Remove unused ash::SHELF_ALIGNMENT_TOP

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/ash_switches.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
@@ skipping 404 matching lines @@
   base::string16 battery = base::ASCIIToUTF16("");
 #if defined(OS_CHROMEOS)
   battery = PowerStatus::Get()->GetAccessibleNameString(false);
 #endif
   return l10n_util::GetStringFUTF16(
       IDS_ASH_STATUS_TRAY_ACCESSIBLE_DESCRIPTION, time, battery);
 }
 
 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 &&
-      shelf_alignment() != SHELF_ALIGNMENT_TOP)
+  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;
 
   const views::View* item_view = it->second;
   if (item_view->bounds().IsEmpty()) {
     // The bounds of item could be still empty if it does not have a visible
@@ skipping 159 matching lines @@
     bubble_view = notification_bubble_->bubble_view();
   else if (system_bubble_)
     bubble_view = system_bubble_->bubble_view();
 
   int height = 0;
   if (bubble_view) {
     gfx::Rect work_area =
         gfx::Screen::GetScreen()
             ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeView())
             .work_area();
-    if (GetShelfLayoutManager()->GetAlignment() != SHELF_ALIGNMENT_TOP) {
-      height = std::max(
-          0, work_area.height() - bubble_view->GetBoundsInScreen().y());
-    } else {
-      height = std::max(
-          0, bubble_view->GetBoundsInScreen().bottom() - work_area.y());
-    }
+    height =
+        std::max(0, work_area.height() - bubble_view->GetBoundsInScreen().y());
   }
   status_area_widget()->web_notification_tray()->SetSystemTrayHeight(height);
 }
 
 base::string16 SystemTray::GetAccessibleTimeString(
     const base::Time& now) const {
   base::HourClockType hour_type =
       ash::Shell::GetInstance()->system_tray_delegate()->GetHourClockType();
   return base::TimeFormatTimeOfDayWithHourClockType(
       now, hour_type, base::kKeepAmPm);
@@ skipping 93 matching lines @@
 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 (HasSystemBubbleType(SystemTrayBubble::BUBBLE_TYPE_DEFAULT)) {
     system_bubble_->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 ||
-          shelf_alignment() == SHELF_ALIGNMENT_TOP) {
+      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, false);
   }
   return true;
 }
 
 void SystemTray::CloseSystemBubbleAndDeactivateSystemTray() {
   system_bubble_.reset();
   // When closing a system bubble with the alternate shelf layout, we need to
   // turn off the active tinting of the shelf.
   if (full_system_tray_menu_) {
     SetDrawBackgroundAsActive(false);
     full_system_tray_menu_ = false;
   }
 }
 
 }  // namespace ash