ash: Fix arrow color for the uber-tray popup.

ash/system/tray/tray_bubble_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_bubble_view.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/wm/shelf_layout_manager.h"
@@ skipping 63 matching lines @@
       : views::BubbleBorder(arrow_location,
                             views::BubbleBorder::NO_SHADOW),
         owner_(owner),
         tray_arrow_offset_(arrow_offset) {
     set_alignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   }
 
   virtual ~TrayBubbleBorder() {}
 
  private:
+  views::Background* FindAppropriateBackground(views::View* view,
+                                               const gfx::Point& point) const {
+    views::Background* background = NULL;
+    views::View* target = view->GetEventHandlerForPoint(point);
+    for (; target && !background; target = target->parent())
+      background = target->background();
+    return background;
+  }
+
   // Overridden from views::BubbleBorder.
   // Override views::BubbleBorder to set the bubble on top of the anchor when
   // it has no arrow.
   virtual gfx::Rect GetBounds(const gfx::Rect& position_relative_to,
                               const gfx::Size& contents_size) const OVERRIDE {
     if (arrow_location() != NONE) {
       return views::BubbleBorder::GetBounds(position_relative_to,
                                             contents_size);
     }
 
@@ skipping 21 matching lines @@
 
     // Draw the bottom line.
     int y = owner_->height() + inset.top();
     canvas->FillRect(gfx::Rect(inset.left(), y, owner_->width(),
                                kBottomLineHeight), kBorderDarkColor);
 
     if (!Shell::GetInstance()->shelf()->IsVisible() ||
         arrow_location() == views::BubbleBorder::NONE)
       return;
 
+    gfx::Point arrow_reference;
+
     // Draw the arrow after drawing child borders, so that the arrow can cover
     // the its overlap section with child border.
     SkPath path;
     path.incReserve(4);
     if (arrow_location() == views::BubbleBorder::BOTTOM_RIGHT) {
       int tip_x = base::i18n::IsRTL() ? tray_arrow_offset_ :
           owner_->width() - tray_arrow_offset_;
       tip_x = std::min(std::max(kArrowMinOffset, tip_x),
                        owner_->width() - kArrowMinOffset);
       int left_base_x = tip_x - kArrowWidth / 2;
       int left_base_y = y;
       int tip_y = left_base_y + kArrowHeight;
       path.moveTo(SkIntToScalar(left_base_x), SkIntToScalar(left_base_y));
       path.lineTo(SkIntToScalar(tip_x), SkIntToScalar(tip_y));
       path.lineTo(SkIntToScalar(left_base_x + kArrowWidth),
                   SkIntToScalar(left_base_y));
+      arrow_reference.SetPoint(tip_x, left_base_y - kArrowHeight);
     } else {
       int tip_y = y - tray_arrow_offset_;
       tip_y = std::min(std::max(kArrowMinOffset, tip_y),
                        owner_->height() - kArrowMinOffset);
       int top_base_y = tip_y - kArrowWidth / 2;
       int top_base_x, tip_x;
       if (arrow_location() == views::BubbleBorder::LEFT_BOTTOM) {
         top_base_x = inset.left() + kSystemTrayBubbleHorizontalInset;
         tip_x = top_base_x - kArrowHeight;
+        arrow_reference.SetPoint(top_base_x + kArrowHeight, tip_y);
       } else {
         DCHECK(arrow_location() == views::BubbleBorder::RIGHT_BOTTOM);
         top_base_x = inset.left() + owner_->width() -
             kSystemTrayBubbleHorizontalInset;
         tip_x = top_base_x + kArrowHeight;
+        arrow_reference.SetPoint(top_base_x - kArrowHeight, tip_y);
       }
       path.moveTo(SkIntToScalar(top_base_x), SkIntToScalar(top_base_y));
       path.lineTo(SkIntToScalar(tip_x), SkIntToScalar(tip_y));
       path.lineTo(SkIntToScalar(top_base_x),
                   SkIntToScalar(top_base_y + kArrowWidth));
     }
 
+    views::Background* background = FindAppropriateBackground(owner_,
+                                                              arrow_reference);
+
     SkPaint paint;
     paint.setStyle(SkPaint::kFill_Style);
-    paint.setColor(kHeaderBackgroundColorDark);
+    paint.setColor(background ? background->get_color() : kBackgroundColor);
     canvas->DrawPath(path, paint);
 
     // Now draw the arrow border.
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setColor(kBorderDarkColor);
     canvas->DrawPath(path, paint);
 
   }
 
   views::View* owner_;
@@ skipping 183 matching lines @@
       return;
   }
   // Handle clicking outside the bubble and tray. We don't block the event, so
   // it will also be handled by whatever widget was clicked on.
   OnClickedOutsideView();
 }
 
 
 }  // namespace internal
 }  // namespace ash