summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorbartfab <bartfab@chromium.org>2015-04-01 10:22:47 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-01 17:23:33 +0000
commit173e3a4aeb9e5393edc15a3e8795b5683e8355a3 (patch)
tree867123c2c6ad25b6175f1e287b7d09b27ef17a69 /ash
parent9a186f7712d224e55ee0e83194eac2a3583ee04a (diff)
downloadchromium_src-173e3a4aeb9e5393edc15a3e8795b5683e8355a3.zip
chromium_src-173e3a4aeb9e5393edc15a3e8795b5683e8355a3.tar.gz
chromium_src-173e3a4aeb9e5393edc15a3e8795b5683e8355a3.tar.bz2
Left-align "Settings..." button in ash tray bubble for VPNs
Per UI review comments, the "Settings..." button at the bottom of the VPN list in the ash tray bubble should be left-aligned. BUG=460428 TEST=Manual Review URL: https://codereview.chromium.org/1053713002 Cr-Commit-Position: refs/heads/master@{#323272}
Diffstat (limited to 'ash')
-rw-r--r--ash/system/chromeos/network/network_state_list_detailed_view.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ash/system/chromeos/network/network_state_list_detailed_view.cc b/ash/system/chromeos/network/network_state_list_detailed_view.cc
index 1bbcccf..db2fd26 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -47,6 +47,7 @@
#include "ui/chromeos/network/network_list.h"
#include "ui/chromeos/network/network_list_view_base.h"
#include "ui/chromeos/resources/grit/ui_chromeos_resources.h"
+#include "ui/gfx/text_constants.h"
#include "ui/views/bubble/bubble_delegate.h"
#include "ui/views/controls/label.h"
#include "ui/views/layout/box_layout.h"
@@ -466,6 +467,8 @@ void NetworkStateListDetailedView::CreateSettingsEntry() {
if (show_settings) {
settings_ = new TrayPopupLabelButton(
this, rb.GetLocalizedString(IDS_ASH_STATUS_TRAY_NETWORK_SETTINGS));
+ if (list_type_ == LIST_TYPE_VPN)
+ settings_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
}
} else {
// Allow users to change proxy settings only when not logged in.