Fixed TrayBackgroundView::GetBubbleAnchorRect to handle left/right alignment when the tray isn't vi…

ash/system/tray/tray_background_view.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/tray_background_view.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 530 matching lines @@
       if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
         bool rtl = base::i18n::IsRTL();
         rect.Inset(
             rtl ? kBubblePaddingHorizontalSide : 0,
             kBubblePaddingHorizontalBottom,
             rtl ? 0 : kBubblePaddingHorizontalSide,
             0);
       } else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT) {
         rect.Inset(0, 0, kBubblePaddingVerticalSide + 4,
                    kBubblePaddingVerticalBottom);
-      } else {
+      } else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT) {
         rect.Inset(kBubblePaddingVerticalSide, 0, 0,
                    kBubblePaddingVerticalBottom);
+      } else {
+        // TODO(bruthig) May need to handle other ANCHOR_ALIGNMENT_ values.
+        // ie. ANCHOR_ALIGNMENT_TOP
+        DCHECK(false) << "Unhandled anchor alignment.";
       }
     } else if (anchor_type == TrayBubbleView::ANCHOR_TYPE_BUBBLE) {
       // Invert the offsets to align with the bubble below.
       // Note that with the alternate shelf layout the tips are not shown and
       // the offsets for left and right alignment do not need to be applied.
       int vertical_alignment = 0;
       int horizontal_alignment = kBubblePaddingVerticalBottom;
       if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT)
         rect.Inset(vertical_alignment, 0, 0, horizontal_alignment);
       else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT)
         rect.Inset(0, 0, vertical_alignment, horizontal_alignment);
+    } else {
+      DCHECK(false) << "Unhandled anchor type.";
     }
-  }
-
-  // TODO(jennyz): May need to add left/right alignment in the following code.
-  if (rect.IsEmpty()) {
+  } else {
     aura::Window* target_root = anchor_widget ?
         anchor_widget->GetNativeView()->GetRootWindow() :
         Shell::GetPrimaryRootWindow();
     rect = target_root->bounds();
-    rect = gfx::Rect(
-        base::i18n::IsRTL() ? kPaddingFromRightEdgeOfScreenBottomAlignment :
-        rect.width() - kPaddingFromRightEdgeOfScreenBottomAlignment,
-        rect.height() - kPaddingFromBottomOfScreenBottomAlignment,
-        0, 0);
-    rect = ScreenUtil::ConvertRectToScreen(target_root, rect);
+    if (anchor_type == TrayBubbleView::ANCHOR_TYPE_TRAY) {
+      if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM) {
+        rect = gfx::Rect(
+            base::i18n::IsRTL() ?
+            kPaddingFromRightEdgeOfScreenBottomAlignment :
+            rect.width() - kPaddingFromRightEdgeOfScreenBottomAlignment,
+            rect.height() - kPaddingFromBottomOfScreenBottomAlignment,
+            0, 0);
+        rect = ScreenUtil::ConvertRectToScreen(target_root, rect);
+      } else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_LEFT) {
+        rect = gfx::Rect(
+            kPaddingFromRightEdgeOfScreenBottomAlignment,
+            rect.height() - kPaddingFromBottomOfScreenBottomAlignment,
+            1, 1);
+        rect = ScreenUtil::ConvertRectToScreen(target_root, rect);
+      } else if (anchor_alignment == TrayBubbleView::ANCHOR_ALIGNMENT_RIGHT) {
+        rect = gfx::Rect(
+            rect.width() - kPaddingFromRightEdgeOfScreenBottomAlignment,
+            rect.height() - kPaddingFromBottomOfScreenBottomAlignment,
+            1, 1);
+        rect = ScreenUtil::ConvertRectToScreen(target_root, rect);
+      } else {
+        // TODO(bruthig) May need to handle other ANCHOR_ALIGNMENT_ values.
+        // ie. ANCHOR_ALIGNMENT_TOP
+        DCHECK(false) << "Unhandled anchor alignment.";
+      }
+    } else {
+      DCHECK(false) << "Unhandled anchor type.";

[bruthig, 2014/07/15 21:00:45]

The WebNotificationTrayTest.PopupAndAutoHideShelf test fails on this DCHECK.

+    }
   }
   return rect;
 }
 
 TrayBubbleView::AnchorAlignment TrayBackgroundView::GetAnchorAlignment() const {
   switch (shelf_alignment_) {
     case SHELF_ALIGNMENT_BOTTOM:
       return TrayBubbleView::ANCHOR_ALIGNMENT_BOTTOM;
     case SHELF_ALIGNMENT_LEFT:
       return TrayBubbleView::ANCHOR_ALIGNMENT_LEFT;
@@ skipping 20 matching lines @@
     background_->set_alpha(kTrayBackgroundAlpha);
   SchedulePaint();
 }
 
 void TrayBackgroundView::UpdateBubbleViewArrow(
     views::TrayBubbleView* bubble_view) {
   // Nothing to do here.
 }
 
 }  // namespace ash