Index: chrome/browser/ui/views/session_crashed_bubble_view.cc |
diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc |
index 6fdd0a2bd455b5018d8e2023c09436bcf88e2a7a..bc6dd75b68ae1cbe75456e2797bc70d2e45cc7de 100644 |
--- a/chrome/browser/ui/views/session_crashed_bubble_view.cc |
+++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc |
@@ -6,6 +6,7 @@ |
#include <vector> |
+#include "base/bind.h" |
#include "base/prefs/pref_service.h" |
#include "chrome/browser/browser_process.h" |
#include "chrome/browser/chrome_notification_types.h" |
@@ -20,6 +21,7 @@ |
#include "chrome/common/url_constants.h" |
#include "chrome/installer/util/google_update_settings.h" |
#include "content/public/browser/browser_context.h" |
+#include "content/public/browser/browser_thread.h" |
#include "content/public/browser/notification_source.h" |
#include "content/public/browser/web_contents.h" |
#include "grit/chromium_strings.h" |
@@ -73,22 +75,42 @@ bool ShouldOfferMetricsReporting() { |
// static |
void SessionCrashedBubbleView::Show(Browser* browser) { |
+ DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
+ |
if (browser->profile()->IsOffTheRecord()) |
return; |
+ // Schedule a task to run ShouldOfferMetricsReporting() on FILE thread. The |
+ // reason of doing this is that GoogleUpdateSettings::GetCollectStatsConsent() |
+ // can't be called from UI thread, but current function is called from UI |
+ // thread. After function ShouldOfferMetricsReporting returns, calls |
+ // SessionCrashedBubbleView::ShowForReal with the returned value as a |
+ // parameter to create and show the bubble. |
Alexei Svitkine (slow)
2014/05/14 21:17:02
Nit: This comment is too verbose for what it's des
yao
2014/05/14 21:24:31
Done.
|
+ content::BrowserThread::PostTaskAndReplyWithResult( |
+ content::BrowserThread::FILE, |
+ FROM_HERE, |
+ base::Bind(&ShouldOfferMetricsReporting), |
+ base::Bind(&SessionCrashedBubbleView::ShowForReal, browser)); |
+} |
+ |
+// static |
+void SessionCrashedBubbleView::ShowForReal(Browser* browser, |
+ bool offer_uma_optin) { |
views::View* anchor_view = |
BrowserView::GetBrowserViewForBrowser(browser)->toolbar()->app_menu(); |
content::WebContents* web_contents = |
browser->tab_strip_model()->GetActiveWebContents(); |
SessionCrashedBubbleView* crash_bubble = |
- new SessionCrashedBubbleView(anchor_view, browser, web_contents); |
+ new SessionCrashedBubbleView(anchor_view, browser, web_contents, |
+ offer_uma_optin); |
views::BubbleDelegateView::CreateBubble(crash_bubble)->Show(); |
} |
SessionCrashedBubbleView::SessionCrashedBubbleView( |
views::View* anchor_view, |
Browser* browser, |
- content::WebContents* web_contents) |
+ content::WebContents* web_contents, |
+ bool offer_uma_optin) |
: BubbleDelegateView(anchor_view, views::BubbleBorder::TOP_RIGHT), |
content::WebContentsObserver(web_contents), |
browser_(browser), |
@@ -96,6 +118,7 @@ SessionCrashedBubbleView::SessionCrashedBubbleView( |
restore_button_(NULL), |
close_(NULL), |
uma_option_(NULL), |
+ offer_uma_optin_(offer_uma_optin), |
started_navigation_(false) { |
set_close_on_deactivate(false); |
registrar_.Add( |
@@ -193,7 +216,7 @@ void SessionCrashedBubbleView::Init() { |
layout->AddPaddingRow(0, kMarginHeight); |
// Metrics reporting option. |
- if (ShouldOfferMetricsReporting()) |
+ if (offer_uma_optin_) |
CreateUmaOptinView(layout); |
set_color(kWhiteBackgroundColor); |