Makes SessionCrashedBubbleView work on chromeos

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 <stddef.h>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 53 matching lines @@
   SESSION_CRASHED_BUBBLE_OPTIN_BAR_SHOWN,
   SESSION_CRASHED_BUBBLE_STARTUP_PAGES,
   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.
-// TODO(crbug.com/653966): Enable this on all desktop platforms.
-bool IsBubbleUIEnabled() {
-// Function ChangeMetricsReportingState (called when the user chooses to
-// opt-in to UMA) does not support Chrome OS yet, so don't show the bubble on
-// Chrome OS.
-#if defined(OS_CHROMEOS)
+bool DoesSupportConsentCheck() {
+#if defined(GOOGLE_CHROME_BUILD) && !defined(OS_CHROMEOS)

[Alexei Svitkine (slow), 2017/01/27 17:27:11]

As I said in the email, I think the consent stuff should work on CrOS now too -
so I think we can just enable this there too and remove this extra helper.

[sky, 2017/01/27 18:25:04]

I clearly misunderstood your email. I removed chromeos from the conditional.

+  return true;
+#else
   return false;
-#else
-  return true;
 #endif
 }
 
 }  // namespace
 
 // A helper class that listens to browser removal event.
 class SessionCrashedBubbleView::BrowserRemovalObserver
     : public chrome::BrowserListObserver {
  public:
   explicit BrowserRemovalObserver(Browser* browser) : browser_(browser) {
@@ skipping 12 matching lines @@
   Browser* browser() const { return browser_; }
 
  private:
   Browser* browser_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserRemovalObserver);
 };
 
 // static
 bool SessionCrashedBubble::Show(Browser* browser) {
-  if (!IsBubbleUIEnabled())
-    return false;
-
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   if (browser->profile()->IsOffTheRecord())
     return true;
 
   // Observes browser removal event and will be deallocated in ShowForReal.
   std::unique_ptr<SessionCrashedBubbleView::BrowserRemovalObserver>
       browser_observer(
           new SessionCrashedBubbleView::BrowserRemovalObserver(browser));
 
-// Stats collection only applies to Google Chrome builds.
-#if defined(GOOGLE_CHROME_BUILD)
-  // Schedule a task to run GoogleUpdateSettings::GetCollectStatsConsent() on
-  // FILE thread, since it does IO. Then, call
-  // SessionCrashedBubbleView::ShowForReal with the result.
-  content::BrowserThread::PostTaskAndReplyWithResult(
-      content::BrowserThread::FILE,
-      FROM_HERE,
-      base::Bind(&GoogleUpdateSettings::GetCollectStatsConsent),
-      base::Bind(&SessionCrashedBubbleView::ShowForReal,
-                 base::Passed(&browser_observer)));
-#else
-  SessionCrashedBubbleView::ShowForReal(std::move(browser_observer), false);
-#endif  // defined(GOOGLE_CHROME_BUILD)
-
+  if (DoesSupportConsentCheck()) {
+    // Schedule a task to run GoogleUpdateSettings::GetCollectStatsConsent() on
+    // FILE thread, since it does IO. Then, call
+    // SessionCrashedBubbleView::ShowForReal with the result.
+    content::BrowserThread::PostTaskAndReplyWithResult(
+        content::BrowserThread::FILE, FROM_HERE,
+        base::Bind(&GoogleUpdateSettings::GetCollectStatsConsent),
+        base::Bind(&SessionCrashedBubbleView::ShowForReal,
+                   base::Passed(&browser_observer)));
+  } else {
+    SessionCrashedBubbleView::ShowForReal(std::move(browser_observer), false);
+  }
   return true;
 }
 
 // static
 void SessionCrashedBubbleView::ShowForReal(
     std::unique_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)
+  if (DoesSupportConsentCheck() && !uma_opted_in_already)
     offer_uma_optin = !IsMetricsReportingPolicyManaged();
-#endif  // defined(GOOGLE_CHROME_BUILD)
 
   Browser* browser = browser_observer->browser();
 
   if (!browser || !browser->tab_strip_model()->GetActiveWebContents()) {
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_ERROR);
     return;
   }
 
   views::View* anchor_view = BrowserView::GetBrowserViewForBrowser(browser)
                                  ->toolbar()
@@ skipping 187 matching lines @@
   // There's no opt-out choice in the crash restore bubble.
   if (uma_option_ && uma_option_->checked()) {
     ChangeMetricsReportingState(true);
     RecordBubbleHistogramValue(SESSION_CRASHED_BUBBLE_UMA_OPTIN);
   }
 }
 
 void SessionCrashedBubbleView::CloseBubble() {
   GetWidget()->Close();
 }