Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(185)

Unified Diff: ash/system/tray/system_tray.cc

Issue 1849623002: Remove unused ash::SHELF_ALIGNMENT_TOP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 09d9fc33c84c092552b1523a4705b1c0a53b42b9..9fc1b8aa5566b14f1707249e368ec45cc8b28668 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -422,8 +422,7 @@ base::string16 SystemTray::GetAccessibleNameForTray() {
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 =
@@ -603,13 +602,8 @@ void SystemTray::UpdateWebNotifications() {
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);
}
@@ -723,8 +717,7 @@ bool SystemTray::PerformAction(const ui::Event& event) {
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();
« no previous file with comments | « ash/system/status_area_widget_delegate.cc ('k') | ash/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698