Commit 54480c31 authored by Sammie Quon's avatar Sammie Quon Committed by Commit Bot

cros: Add separator between help and settings on palette menu.

As per UI review request to look the seperator for the tiles in the system tray bubble.

Test: manual
Bug: 747148
Change-Id: I2259bc498fb571d1c44d7e42a9970168c5872436
Reviewed-on: https://chromium-review.googlesource.com/580636Reviewed-by: default avatarJames Cook <jamescook@chromium.org>
Commit-Queue: Sammie Quon <sammiequon@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488499}
parent 96d6dbfa
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "ash/system/tray/tray_container.h" #include "ash/system/tray/tray_container.h"
#include "ash/system/tray/tray_popup_header_button.h" #include "ash/system/tray/tray_popup_header_button.h"
#include "ash/system/tray/tray_popup_item_style.h" #include "ash/system/tray/tray_popup_item_style.h"
#include "ash/system/tray/tray_popup_utils.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
...@@ -85,6 +86,8 @@ class TitleView : public views::View, public views::ButtonListener { ...@@ -85,6 +86,8 @@ class TitleView : public views::View, public views::ButtonListener {
// TODO(tdanderson|jdufault): Use TriView to handle the layout of the title. // TODO(tdanderson|jdufault): Use TriView to handle the layout of the title.
// See crbug.com/614453. // See crbug.com/614453.
auto* box_layout = new views::BoxLayout(views::BoxLayout::kHorizontal); auto* box_layout = new views::BoxLayout(views::BoxLayout::kHorizontal);
box_layout->set_cross_axis_alignment(
views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
SetLayoutManager(box_layout); SetLayoutManager(box_layout);
auto* title_label = auto* title_label =
...@@ -102,6 +105,7 @@ class TitleView : public views::View, public views::ButtonListener { ...@@ -102,6 +105,7 @@ class TitleView : public views::View, public views::ButtonListener {
kSystemMenuSettingsIcon, IDS_ASH_PALETTE_SETTINGS); kSystemMenuSettingsIcon, IDS_ASH_PALETTE_SETTINGS);
AddChildView(help_button_); AddChildView(help_button_);
AddChildView(TrayPopupUtils::CreateVerticalSeparator());
AddChildView(settings_button_); AddChildView(settings_button_);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment