summaryrefslogtreecommitdiffstats
path: root/ash/system/chromeos
diff options
context:
space:
mode:
authorharrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-24 04:49:36 +0000
committerharrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-24 04:49:36 +0000
commit70fa3b9e48f1d557105e15ab0803d56bca7b9e1b (patch)
tree13a99a0fdb7d552056f7183a5e551f72080e098e /ash/system/chromeos
parentd6479a213757f25b68e8cd78d50752fe021d546d (diff)
downloadchromium_src-70fa3b9e48f1d557105e15ab0803d56bca7b9e1b.zip
chromium_src-70fa3b9e48f1d557105e15ab0803d56bca7b9e1b.tar.gz
chromium_src-70fa3b9e48f1d557105e15ab0803d56bca7b9e1b.tar.bz2
wifi icon centered when vertically aligned.
BUG=292907 Review URL: https://chromiumcodereview.appspot.com/24067007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224903 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/chromeos')
-rw-r--r--ash/system/chromeos/network/tray_network.cc12
1 files changed, 11 insertions, 1 deletions
diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index a083316..130ff16 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -89,6 +89,14 @@ class NetworkTrayView : public TrayItemView,
UpdateConnectionStatus(base::string16(), false);
}
+ void UpdateAlignment(ShelfAlignment alignment) {
+ SetLayoutManager(new views::BoxLayout(
+ alignment == SHELF_ALIGNMENT_BOTTOM ?
+ views::BoxLayout::kHorizontal : views::BoxLayout::kVertical,
+ 0, 0, 0));
+ Layout();
+ }
+
// views::View override.
virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
state->name = connection_status_string_;
@@ -310,8 +318,10 @@ void TrayNetwork::UpdateAfterLoginStatusChange(user::LoginStatus status) {
}
void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
- if (tray_)
+ if (tray_) {
SetTrayImageItemBorder(tray_, alignment);
+ tray_->UpdateAlignment(alignment);
+ }
}
void TrayNetwork::RequestToggleWifi() {