Update chromeos system menu buttons for MD.

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

 // Copyright 2015 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/vpn_list_view.h"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
+#include "ash/common/material_design/material_design_controller.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"
 #include "ash/common/system/chromeos/network/network_list_delegate.h"
 #include "ash/common/system/chromeos/network/vpn_delegate.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_label_button.h"
+#include "ash/common/system/tray/tray_utils.h"
 #include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chromeos/network/network_connection_handler.h"
 #include "chromeos/network/network_handler.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_type_pattern.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 
 namespace ash {
 
 namespace {
 
+bool UseMd() {
+  return MaterialDesignController::IsSystemTrayMenuMaterial();
+}
+
 bool IsConnectedOrConnecting(const chromeos::NetworkState* network) {
   return network->IsConnectedState() || network->IsConnectingState();
 }
 
 void IgnoreDisconnectError(const std::string& error_name,
                            std::unique_ptr<base::DictionaryValue> error_data) {}
 
 // The base class of all list entries, a |HoverHighlightView| with no border.
 class VPNListEntryBase : public HoverHighlightView {
  public:
@@ skipping 47 matching lines @@
 
     VPNListNetworkEntry* parent_;
 
     DISALLOW_COPY_AND_ASSIGN(DisconnectButton);
   };
 
   void UpdateFromNetworkState(const chromeos::NetworkState* network);
 
   const std::string service_path_;
 
-  DisconnectButton* disconnect_button_ = nullptr;
+  views::LabelButton* disconnect_button_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(VPNListNetworkEntry);
 };
 
 VPNListEntryBase::VPNListEntryBase(VPNListView* parent)
     : HoverHighlightView(parent) {
   SetBorder(
       views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
 }
 
@@ skipping 35 matching lines @@
       ->DisconnectNetwork(service_path_, base::Bind(&base::DoNothing),
                           base::Bind(&IgnoreDisconnectError));
 }
 
 VPNListNetworkEntry::DisconnectButton::DisconnectButton(
     VPNListNetworkEntry* parent)
     : TrayPopupLabelButton(
           parent,
           l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_DISCONNECT)),
       parent_(parent) {
+  DCHECK(!UseMd());
   DCHECK(parent_);
 }
 
 void VPNListNetworkEntry::DisconnectButton::OnMouseEntered(
     const ui::MouseEvent& event) {
   TrayPopupLabelButton::OnMouseEntered(event);
   parent_->SetHoverHighlight(false);
 }
 
 void VPNListNetworkEntry::DisconnectButton::OnMouseExited(
@@ skipping 26 matching lines @@
   }
 
   RemoveAllChildViews(true);
   disconnect_button_ = nullptr;
 
   AddIconAndLabel(
       network_icon::GetImageForNetwork(network, network_icon::ICON_TYPE_LIST),
       network_icon::GetLabelForNetwork(network, network_icon::ICON_TYPE_LIST),
       IsConnectedOrConnecting(network));
   if (IsConnectedOrConnecting(network)) {
-    disconnect_button_ = new DisconnectButton(this);
+    if (UseMd()) {
+      disconnect_button_ = CreateTrayPopupButton(
+          this, l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_VPN_DISCONNECT));
+    } else {
+      disconnect_button_ = new DisconnectButton(this);
+    }
     AddChildView(disconnect_button_);
-    SetBorder(
-        views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 3));
+    SetBorder(views::Border::CreateEmptyBorder(
+        0, kTrayPopupPaddingHorizontal, 0,
+        UseMd() ? kTrayPopupButtonEndMargin : 3));
   } else {
     SetBorder(
         views::Border::CreateEmptyBorder(0, kTrayPopupPaddingHorizontal, 0, 0));
   }
 
   // The icon and the disconnect button are always set to their preferred size.
   // All remaining space is used for the network name.
-  views::BoxLayout* layout = new views::BoxLayout(
-      views::BoxLayout::kHorizontal, 0, 3, kTrayPopupPaddingBetweenItems);
+  views::BoxLayout* layout =
+      new views::BoxLayout(views::BoxLayout::kHorizontal, 0, UseMd() ? 0 : 3,
+                           kTrayPopupPaddingBetweenItems);
+  if (UseMd())

[tdanderson, 2016/11/01 22:38:50]

nit: if (UseMd()) {
  ...
}

[Evan Stade, 2016/11/01 23:54:09]

Done.

+    layout->set_cross_axis_alignment(
+        views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   SetLayoutManager(layout);
   layout->SetDefaultFlex(0);
   layout->SetFlexForView(text_label(), 1);
   Layout();
 }
 
 }  // namespace
 
 VPNListView::VPNListView(NetworkListDelegate* delegate) : delegate_(delegate) {
   WmShell::Get()->system_tray_delegate()->GetVPNDelegate()->AddObserver(this);
@@ skipping 174 matching lines @@
     }
   }
 
   // Add providers without any configured networks, in the order that the
   // providers were returned by the extensions system.
   for (const VPNProvider& provider : providers)
     AddProviderAndNetworks(provider.key, provider.name, networks);
 }
 
 }  // namespace ash