Margin tweaks in the desktop user menu UI

chrome/browser/ui/views/profiles/profile_chooser_view.cc

Index: chrome/browser/ui/views/profiles/profile_chooser_view.cc
diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view.cc b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
index cbae94c49150976daea87beb1a9ca1efbfd16644..dcdaef19213648e3f71a6f11932978839aa6d5b0 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.cc
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.cc
@@ -1565,7 +1565,7 @@ views::View* ProfileChooserView::CreateMaterialDesignCurrentProfileView(
   current_profile_name->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   NonInteractiveContainer* profile_name_container =
       new NonInteractiveContainer();
-  int name_container_v_spacing = views::kRelatedControlSmallVerticalSpacing;
+  int name_container_v_spacing = views::kRelatedControlVerticalSpacing;
   if (!avatar_item.signed_in || switches::IsEnableAccountConsistency())
     name_container_v_spacing += views::kRelatedControlVerticalSpacing;
   profile_name_container->SetLayoutManager(new views::BoxLayout(
@@ -1801,15 +1801,17 @@ views::View* ProfileChooserView::CreateOptionsView(bool display_lock,
 
 views::View* ProfileChooserView::CreateSupervisedUserDisclaimerView() {
   views::View* view = new views::View();
+  int horizontalMargin = switches::IsMaterialDesignUserMenu() ?

[msw, 2016/07/12 19:10:00]

nit: horizontal_margin (match naming conventions)

[Jane, 2016/07/12 19:15:11]

Thanks! I was on cocoa for too long...

+      kMaterialMenuEdgeMargin : views::kButtonHEdgeMarginNew;
   views::GridLayout* layout = CreateSingleColumnLayout(
-      view, GetFixedMenuWidth() - 2 * views::kButtonHEdgeMarginNew);
+      view, GetFixedMenuWidth() - 2 * horizontalMargin);
   if (switches::IsMaterialDesignUserMenu()) {
-    layout->SetInsets(0, kMaterialMenuEdgeMargin, kMaterialMenuEdgeMargin,
-                      kMaterialMenuEdgeMargin);
+    layout->SetInsets(0, horizontalMargin,
+                      kMaterialMenuEdgeMargin, horizontalMargin);
   } else {
     layout->SetInsets(
-        views::kRelatedControlVerticalSpacing, views::kButtonHEdgeMarginNew,
-        views::kRelatedControlVerticalSpacing, views::kButtonHEdgeMarginNew);
+        views::kRelatedControlVerticalSpacing, horizontalMargin,
+        views::kRelatedControlVerticalSpacing, horizontalMargin);
   }
 
   views::Label* disclaimer = new views::Label(