Update TrayPopupHeaderButton Visual Feedback

ash/system/tray/special_popup_row.cc

 // Copyright (c) 2013 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/special_popup_row.h"
 
 #include "ash/system/tray/hover_highlight_view.h"
 #include "ash/system/tray/throbber_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_header_button.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/painter.h"
 
 namespace ash {
 namespace {
 
 const int kIconPaddingLeft = 5;
+const int kSeparatorInset = 10;
 const int kSpecialPopupRowHeight = 55;
 const int kBorderHeight = 1;
 const SkColor kBorderColor = SkColorSetRGB(0xaa, 0xaa, 0xaa);
 
 views::View* CreatePopupHeaderButtonsContainer() {
   views::View* view = new views::View;
-  view->SetLayoutManager(new
-      views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, -1));
-  view->SetBorder(views::Border::CreateEmptyBorder(0, 0, 0, 5));
+  view->SetLayoutManager(
+      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
+  view->SetBorder(views::Border::CreateEmptyBorder(4, 0, 4, 5));
   return view;
 }
 
 }  // namespace
 
 SpecialPopupRow::SpecialPopupRow()
     : content_(NULL),
       button_container_(NULL) {
   set_background(views::Background::CreateSolidBackground(
       kHeaderBackgroundColor));
@@ skipping 34 matching lines @@
   CHECK(!content_);
   content_ = view;
   AddChildViewAt(content_, 0);
 }
 
 void SpecialPopupRow::AddButton(TrayPopupHeaderButton* button) {
   if (!button_container_) {
     button_container_ = CreatePopupHeaderButtonsContainer();
     AddChildView(button_container_);
   }
+  views::Separator* separator =
+      new views::Separator(views::Separator::VERTICAL);
+  separator->SetColor(ash::kBorderDarkColor);
+  separator->SetBorder(
+      views::Border::CreateEmptyBorder(kSeparatorInset, 0, kSeparatorInset, 0));
+  button_container_->AddChildView(separator);
   button_container_->AddChildView(button);
 }
 
 void SpecialPopupRow::AddThrobber(ThrobberView* throbber) {
   if (!button_container_) {
     button_container_ = CreatePopupHeaderButtonsContainer();
     AddChildView(button_container_);
   }
   button_container_->AddChildView(throbber);
 }
@@ skipping 24 matching lines @@
   container_bounds.ClampToCenteredSize(bounds.size());
   container_bounds.set_x(content_bounds.width() - container_bounds.width());
   button_container_->SetBoundsRect(container_bounds);
 
   bounds = content_->bounds();
   bounds.set_width(button_container_->x());
   content_->SetBoundsRect(bounds);
 }
 
 }  // namespace ash