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

ash/system/tray/system_tray_bubble.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_bubble.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 55 matching lines @@
     int index = parent->GetIndexOf(owner_);
     insets->Set(index == 0, 1, index != parent->child_count() - 1, 1);
   }
 
   views::View* owner_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayPopupItemBorder);
 };
 
 // A view with some special behaviour for tray items in the popup:
-// - changes background color on hover.
+// - optionally changes background color on hover.
 class TrayPopupItemContainer : public views::View {
  public:
-  explicit TrayPopupItemContainer(views::View* view) : hover_(false) {
+  TrayPopupItemContainer(views::View* view, bool change_background)
+      : hover_(false),
+        change_background_(change_background) {
     set_notify_enter_exit_on_child(true);
     set_border(new TrayPopupItemBorder(this));
     views::BoxLayout* layout = new views::BoxLayout(
         views::BoxLayout::kVertical, 0, 0, 0);
     layout->set_spread_blank_space(true);
     SetLayoutManager(layout);
     SetPaintToLayer(view->layer() != NULL);
     if (view->layer())
       SetFillsBoundsOpaquely(view->layer()->fills_bounds_opaquely());
     AddChildView(view);
@@ skipping 24 matching lines @@
     hover_ = false;
     SchedulePaint();
   }
 
   virtual void OnPaintBackground(gfx::Canvas* canvas) OVERRIDE {
     if (child_count() == 0)
       return;
 
     views::View* view = child_at(0);
     if (!view->background()) {
-      canvas->FillRect(gfx::Rect(size()),
-          hover_ ? kHoverBackgroundColor : kBackgroundColor);
+      canvas->FillRect(gfx::Rect(size()), (hover_ && change_background_) ?
+          kHoverBackgroundColor : kBackgroundColor);
     }
   }
 
   bool hover_;
+  bool change_background_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayPopupItemContainer);
 };
 
 // Implicit animation observer that deletes itself and the layer at the end of
 // the animation.
 class AnimationObserverDeleteLayer : public ui::ImplicitAnimationObserver {
  public:
   explicit AnimationObserverDeleteLayer(ui::Layer* layer)
       : layer_(layer) {
@@ skipping 305 matching lines @@
       case BUBBLE_TYPE_DEFAULT:
         view = (*it)->CreateDefaultView(login_status);
         break;
       case BUBBLE_TYPE_DETAILED:
         view = (*it)->CreateDetailedView(login_status);
         break;
       case BUBBLE_TYPE_NOTIFICATION:
         view = (*it)->CreateNotificationView(login_status);
         break;
     }
-    if (view)
-      bubble_view_->AddChildView(new TrayPopupItemContainer(view));
+    if (view) {
+      bubble_view_->AddChildView(new TrayPopupItemContainer(
+          view, bubble_type_ == BUBBLE_TYPE_DEFAULT));
+    }
   }
 }
 
 bool SystemTrayBubble::ProcessLocatedEvent(const aura::LocatedEvent& event) {
   DCHECK_NE(BUBBLE_TYPE_NOTIFICATION, bubble_type_);
   gfx::Rect bounds = bubble_widget_->GetNativeWindow()->GetBoundsInRootWindow();
   if (bounds.Contains(event.root_location()))
     return false;
 
   bubble_widget_->Close();
@@ skipping 35 matching lines @@
 }
 
 void SystemTrayBubble::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(bubble_widget_, widget);
   bubble_widget_ = NULL;
   tray_->RemoveBubble(this);
 }
 
 }  // namespace internal
 }  // namespace ash