Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1996)

Unified Diff: ash/system/chromeos/network/network_state_list_detailed_view.cc

Issue 12426025: Correctly add 'Extra' buttons to NetworkStateListDetailedView (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/chromeos/network/network_state_list_detailed_view.cc
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 eeb50e10d3f6f58ddd7c08862a189a0dc45ddde3..167c83aa2a9f0945d1739c0babac32c63d960527 100644
--- a/ash/system/chromeos/network/network_state_list_detailed_view.cc
+++ b/ash/system/chromeos/network/network_state_list_detailed_view.cc
@@ -188,10 +188,10 @@ void NetworkStateListDetailedView::NetworkIconChanged() {
void NetworkStateListDetailedView::Init() {
CreateScrollableList();
+ CreateNetworkExtra();
CreateHeaderEntry();
CreateHeaderButtons();
CreateMobileAccount();
- CreateNetworkExtra();
NetworkStateHandler* handler = NetworkStateHandler::Get();
NetworkStateList network_list;
handler->RequestScan();
@@ -355,6 +355,13 @@ void NetworkStateListDetailedView::CreateNetworkExtra() {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
views::View* bottom_row = new views::View();
+ views::BoxLayout* layout = new views::BoxLayout(
+ views::BoxLayout::kHorizontal,
+ kTrayMenuBottomRowPadding,
+ kTrayMenuBottomRowPadding,
+ kTrayMenuBottomRowPaddingBetweenItems);
+ layout->set_spread_blank_space(true);
+ bottom_row->SetLayoutManager(layout);
if (list_type_ == LIST_TYPE_NETWORK) {
other_wifi_ = new TrayPopupLabelButton(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698