Simplify layout of tray items and fix spacing for MD.

ash/common/system/chromeos/network/tray_network.cc

 // Copyright (c) 2012 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/common/system/chromeos/network/tray_network.h"
 
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/chromeos/network/network_icon.h"
 #include "ash/common/system/chromeos/network/network_icon_animation.h"
 #include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
@@ skipping 30 matching lines @@
 using chromeos::NetworkTypePattern;
 
 namespace ash {
 namespace tray {
 
 class NetworkTrayView : public TrayItemView,
                         public network_icon::AnimationObserver {
  public:
   explicit NetworkTrayView(TrayNetwork* network_tray)
       : TrayItemView(network_tray) {
-    SetLayoutManager(
-        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
-
-    image_view_ = new views::ImageView;
-    AddChildView(image_view_);
-
+    CreateImageView();
     UpdateNetworkStateHandlerIcon();
   }
 
   ~NetworkTrayView() override {
     network_icon::NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   }
 
   const char* GetClassName() const override { return "NetworkTrayView"; }
 
   void UpdateNetworkStateHandlerIcon() {
@@ skipping 14 matching lines @@
     const NetworkState* connected_network =
         handler->ConnectedNetworkByType(NetworkTypePattern::NonVirtual());
     if (connected_network) {
       UpdateConnectionStatus(base::UTF8ToUTF16(connected_network->name()),
                              true);
     } else {
       UpdateConnectionStatus(base::string16(), false);
     }
   }
 
-  void UpdateAlignment(ShelfAlignment alignment) {
-    SetLayoutManager(new views::BoxLayout(IsHorizontalAlignment(alignment)
-                                              ? views::BoxLayout::kHorizontal
-                                              : views::BoxLayout::kVertical,
-                                          0, 0, 0));
-    Layout();
-  }
-
   // views::View:
   void GetAccessibleState(ui::AXViewState* state) override {
     state->name = connection_status_string_;
     state->role = ui::AX_ROLE_BUTTON;
   }
 
   // network_icon::AnimationObserver:
   void NetworkIconChanged() override { UpdateNetworkStateHandlerIcon(); }
 
  private:
   // Updates connection status and notifies accessibility event when necessary.
   void UpdateConnectionStatus(const base::string16& network_name,
                               bool connected) {
     base::string16 new_connection_status_string;
     if (connected) {
       new_connection_status_string = l10n_util::GetStringFUTF16(
           IDS_ASH_STATUS_TRAY_NETWORK_CONNECTED, network_name);
     }
     if (new_connection_status_string != connection_status_string_) {
       connection_status_string_ = new_connection_status_string;
       if (!connection_status_string_.empty())
         NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
     }
   }
 
   void UpdateIcon(bool tray_icon_visible, const gfx::ImageSkia& image) {
-    image_view_->SetImage(image);
+    image_view()->SetImage(image);
     SetVisible(tray_icon_visible);
     SchedulePaint();
   }
 
-  views::ImageView* image_view_;
   base::string16 connection_status_string_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkTrayView);
 };
 
 class NetworkDefaultView : public TrayItemMore,
                            public network_icon::AnimationObserver {
  public:
   NetworkDefaultView(TrayNetwork* network_tray, bool show_more)
       : TrayItemMore(network_tray, show_more) {
@@ skipping 160 matching lines @@
   default_ = NULL;
 }
 
 void TrayNetwork::DestroyDetailedView() {
   detailed_ = NULL;
 }
 
 void TrayNetwork::UpdateAfterLoginStatusChange(LoginStatus status) {}
 
 void TrayNetwork::UpdateAfterShelfAlignmentChange(ShelfAlignment alignment) {
-  if (tray_) {
+  if (tray_)
     SetTrayImageItemBorder(tray_, alignment);
-    tray_->UpdateAlignment(alignment);
-  }
 }
 
 void TrayNetwork::RequestToggleWifi() {
   // This will always be triggered by a user action (e.g. keyboard shortcut)
   if (!detailed_ ||
       detailed_->GetViewType() == tray::NetworkDetailedView::WIFI_VIEW) {
     request_wifi_view_ = true;
     PopupDetailedView(kTrayPopupAutoCloseDelayForTextInSeconds, false);
   }
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
@@ skipping 12 matching lines @@
 void TrayNetwork::NetworkStateChanged() {
   if (tray_)
     tray_->UpdateNetworkStateHandlerIcon();
   if (default_)
     default_->Update();
   if (detailed_)
     detailed_->Update();
 }
 
 }  // namespace ash