Correct when bubble_shown should be recorded

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 56 matching lines @@
 const char kEnableBubbleUIGroupEnabled[] = "Enabled";
 
 enum SessionCrashedBubbleHistogramValue {
   SESSION_CRASHED_BUBBLE_SHOWN,
   SESSION_CRASHED_BUBBLE_ERROR,
   SESSION_CRASHED_BUBBLE_RESTORED,
   SESSION_CRASHED_BUBBLE_ALREADY_UMA_OPTIN,
   SESSION_CRASHED_BUBBLE_UMA_OPTIN,
   SESSION_CRASHED_BUBBLE_HELP,
   SESSION_CRASHED_BUBBLE_IGNORED,
+  SESSION_CRASHED_BUBBLE_OPTIN_BAR_SHOWN,
   SESSION_CRASHED_BUBBLE_MAX,
 };
 
 void RecordBubbleHistogramValue(SessionCrashedBubbleHistogramValue value) {
   UMA_HISTOGRAM_ENUMERATION(
       "SessionCrashed.Bubble", value, SESSION_CRASHED_BUBBLE_MAX);
 }
 
 // Whether or not the bubble UI should be used.
 bool IsBubbleUIEnabled() {
@@ skipping 65 matching lines @@
 // static
 void SessionCrashedBubbleView::ShowForReal(
     scoped_ptr<BrowserRemovalObserver> browser_observer,
     bool uma_opted_in_already) {
   // Determine whether or not the uma opt-in option should be offered. It is
   // offered only when it is a Google chrome build, user hasn't opted in yet,
   // and the preference is modifiable by the user.
   bool offer_uma_optin = false;
 
 #if defined(GOOGLE_CHROME_BUILD)
-  if (uma_opted_in_already) {
-    RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_ALREADY_UMA_OPTIN);
-  } else {
+  if (!uma_opted_in_already) {
     offer_uma_optin = g_browser_process->local_state()->FindPreference(
         prefs::kMetricsReportingEnabled)->IsUserModifiable();
   }
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
   Browser* browser = browser_observer->browser();
 
   if (!browser) {
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_ERROR);
     return;
   }
 
   views::View* anchor_view =
       BrowserView::GetBrowserViewForBrowser(browser)->toolbar()->app_menu();
   content::WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
 
   if (!web_contents) {
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_ERROR);
     return;
   }
 
   SessionCrashedBubbleView* crash_bubble =
       new SessionCrashedBubbleView(anchor_view, browser, web_contents,
                                    offer_uma_optin);
   views::BubbleDelegateView::CreateBubble(crash_bubble)->Show();
+
   RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_SHOWN);
+  if (uma_opted_in_already)
+    RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_ALREADY_UMA_OPTIN);
 }
 
 SessionCrashedBubbleView::SessionCrashedBubbleView(
     views::View* anchor_view,
     Browser* browser,
     content::WebContents* web_contents,
     bool offer_uma_optin)
     : BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT),
       content::WebContentsObserver(web_contents),
       browser_(browser),
@@ skipping 73 matching lines @@
 
   layout->StartRow(0, kTextColumnSetId);
   layout->AddView(text_label);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   layout->StartRow(0, kButtonColumnSetId);
   layout->AddView(restore_button_);
   layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
   // Metrics reporting option.
-  if (offer_uma_optin_)
+  if (offer_uma_optin_) {
     CreateUmaOptinView(layout);
+    RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_OPTIN_BAR_SHOWN);
+  }
 
   set_margins(gfx::Insets());
   Layout();
 }
 
 void SessionCrashedBubbleView::CreateUmaOptinView(GridLayout* layout) {
   // Checkbox for metric reporting setting.
   // Since the text to the right of the checkbox can't be a simple string (needs
   // a hyperlink in it), this checkbox contains an empty string as its label,
   // and the real text will be added as a separate view.
@@ skipping 132 matching lines @@
   GetWidget()->Close();
 }
 
 bool ShowSessionCrashedBubble(Browser* browser) {
   if (IsBubbleUIEnabled()) {
     SessionCrashedBubbleView::Show(browser);
     return true;
   }
   return false;
 }