Checkbox alignment & bigger height for Uma opt-in view.

chrome/browser/ui/views/session_crashed_bubble_view.cc

 // Copyright 2014 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 "chrome/browser/ui/views/session_crashed_bubble_view.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 37 matching lines @@
 using views::GridLayout;
 
 namespace {
 
 // Fixed width of the column holding the description label of the bubble.
 const int kWidthOfDescriptionText = 320;
 
 // Distance between checkbox and the text to the right of it.
 const int kCheckboxTextDistance = 4;
 
-// The color of the text and background of the sub panel to offer UMA optin.
+// The color of the text and background of the sub panel to offer UMA opt-in.
 // These values match the BookmarkSyncPromoView colors.
 const SkColor kBackgroundColor = SkColorSetRGB(245, 245, 245);
 const SkColor kTextColor = SkColorSetRGB(102, 102, 102);
 
 // The Finch study name and group name that enables session crashed bubble UI.
 const char kEnableBubbleUIFinchName[] = "EnableSessionCrashedBubbleUI";
 const char kEnableBubbleUIGroupEnabled[] = "Enabled";
 
 enum SessionCrashedBubbleHistogramValue {
   SESSION_CRASHED_BUBBLE_SHOWN,
@@ skipping 218 matching lines @@
   if (offer_uma_optin_) {
     const int kUMAOptionColumnSetId = 2;
     cs = layout->AddColumnSet(kUMAOptionColumnSetId);
     cs->AddColumn(
         GridLayout::FILL, GridLayout::FILL, 1, GridLayout::USE_PREF, 0, 0);
     layout->StartRow(1, kUMAOptionColumnSetId);
     layout->AddView(new views::Separator(views::Separator::HORIZONTAL));
     layout->StartRow(1, kUMAOptionColumnSetId);
     layout->AddView(CreateUMAOptinView());
 
-    // Since the UMA optin row has a different background than the default
+    // Since the UMA opt-in row has a different background than the default
     // background color of bubbles, the bottom margin has to be 0 to make sure
     // the background extends to the bottom edge of the bubble.
     bottom_margin = 0;
 
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_OPTIN_BAR_SHOWN);
   }
 
   set_margins(gfx::Insets(1, 0, bottom_margin, 0));
   Layout();
 }
@@ skipping 21 matching lines @@
   uma_label->AddStyleRange(gfx::Range(offset, offset + link_text.length()),
                            link_style);
   views::StyledLabel::RangeStyleInfo uma_style;
   uma_style.color = kTextColor;
   gfx::Range before_link_range(0, offset);
   if (!before_link_range.is_empty())
     uma_label->AddStyleRange(before_link_range, uma_style);
   gfx::Range after_link_range(offset + link_text.length(), uma_text.length());
   if (!after_link_range.is_empty())
     uma_label->AddStyleRange(after_link_range, uma_style);
+  // Shift the text down by 1px to align with the checkbox.
+  uma_label->SetBorder(views::Border::CreateEmptyBorder(1, 0, 0, 0));
 
   // Create a view to hold the checkbox and the text.
   views::View* uma_view = new views::View();
   GridLayout* uma_layout = new GridLayout(uma_view);
   uma_view->SetLayoutManager(uma_layout);
 
   uma_view->set_background(
       views::Background::CreateSolidBackground(kBackgroundColor));
   int inset_left = GetBubbleFrameView()->GetTitleInsets().left();
+
+  // Bottom inset for UMA opt-in view in pixels.
+  const int kUMAOptinViewBottomInset = 10;
   uma_layout->SetInsets(views::kRelatedControlVerticalSpacing, inset_left,
-                        views::kRelatedControlVerticalSpacing, inset_left);
+                        kUMAOptinViewBottomInset, inset_left);
 
   const int kReportColumnSetId = 0;
   views::ColumnSet* cs = uma_layout->AddColumnSet(kReportColumnSetId);
   cs->AddColumn(GridLayout::CENTER, GridLayout::LEADING, 0,
                 GridLayout::USE_PREF, 0, 0);
   cs->AddPaddingColumn(0, kCheckboxTextDistance);
   cs->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                 GridLayout::FIXED, kWidthOfDescriptionText, 0);
 
   uma_layout->StartRow(0, kReportColumnSetId);
@@ skipping 53 matching lines @@
                                              int index) {
   if (web_contents_ == contents)
     CloseBubble();
 }
 
 void SessionCrashedBubbleView::RestorePreviousSession(views::Button* sender) {
   SessionRestore::RestoreSessionAfterCrash(browser_);
   RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_RESTORED);
   restored_ = true;
 
-  // Record user's choice for opting in to UMA.
-  // There's no opting-out choice in the crash restore bubble.
+  // Record user's choice for opt-in in to UMA.
+  // There's no opt-out choice in the crash restore bubble.
   if (uma_option_ && uma_option_->checked()) {
     InitiateMetricsReportingChange(true, OnMetricsReportingCallbackType());
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_UMA_OPTIN);
   }
   CloseBubble();
 }
 
 void SessionCrashedBubbleView::CloseBubble() {
   GetWidget()->Close();
 }
 
 bool ShowSessionCrashedBubble(Browser* browser) {
   if (IsBubbleUIEnabled()) {
     SessionCrashedBubbleView::Show(browser);
     return true;
   }
   return false;
 }