Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(494)

Unified Diff: chrome/browser/ui/views/sad_tab_view.cc

Issue 2172013002: Wire up OOM exception to the sad tab page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@memory2
Patch Set: increment outside macro Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/sad_tab_types.h ('k') | components/new_or_sad_tab_strings.grdp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/sad_tab_view.cc
diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc
index 7b3c647a4f0e03dec312d001e01fff57e8d1cf23..593b791f518f875d5562700f06f0414db1f4daa9 100644
--- a/chrome/browser/ui/views/sad_tab_view.cc
+++ b/chrome/browser/ui/views/sad_tab_view.cc
@@ -50,30 +50,26 @@ const int kCrashesBeforeFeedbackIsDisplayed = 1;
void RecordKillCreated() {
static int killed = 0;
killed++;
- UMA_HISTOGRAM_CUSTOM_COUNTS(
- "Tabs.SadTab.KillCreated", killed, 1, 1000, 50);
+ UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.KillCreated", killed);
}
void RecordKillDisplayed() {
static int killed = 0;
killed++;
- UMA_HISTOGRAM_CUSTOM_COUNTS(
- "Tabs.SadTab.KillDisplayed", killed, 1, 1000, 50);
+ UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.KillDisplayed", killed);
}
#if defined(OS_CHROMEOS)
void RecordKillCreatedOOM() {
static int oom_killed = 0;
oom_killed++;
- UMA_HISTOGRAM_CUSTOM_COUNTS(
- "Tabs.SadTab.KillCreated.OOM", oom_killed, 1, 1000, 50);
+ UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.KillCreated.OOM", oom_killed);
}
void RecordKillDisplayedOOM() {
static int oom_killed = 0;
oom_killed++;
- UMA_HISTOGRAM_CUSTOM_COUNTS(
- "Tabs.SadTab.KillDisplayed.OOM", oom_killed, 1, 1000, 50);
+ UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.KillDisplayed.OOM", oom_killed);
}
#endif
@@ -102,8 +98,7 @@ SadTabView::SadTabView(WebContents* web_contents, chrome::SadTabKind kind)
case chrome::SAD_TAB_KIND_CRASHED: {
static int crashed = 0;
crashed++;
- UMA_HISTOGRAM_CUSTOM_COUNTS(
- "Tabs.SadTab.CrashCreated", crashed, 1, 1000, 50);
+ UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.CrashCreated", crashed);
break;
}
case chrome::SAD_TAB_KIND_KILLED: {
@@ -112,6 +107,12 @@ SadTabView::SadTabView(WebContents* web_contents, chrome::SadTabKind kind)
<< web_contents->GetURL().GetOrigin().spec();
break;
}
+ case chrome::SAD_TAB_KIND_OOM: {
+ static int crashed_due_to_oom = 0;
+ crashed_due_to_oom++;
+ UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.OomCreated", crashed_due_to_oom);
+ break;
+ }
#if defined(OS_CHROMEOS)
case chrome::SAD_TAB_KIND_KILLED_BY_OOM: {
RecordKillCreated();
@@ -166,6 +167,8 @@ SadTabView::SadTabView(WebContents* web_contents, chrome::SadTabKind kind)
if (kind_ == chrome::SAD_TAB_KIND_KILLED_BY_OOM)
message_id = IDS_KILLED_TAB_BY_OOM_MESSAGE;
#endif
+ if (kind_ == chrome::SAD_TAB_KIND_OOM)
+ message_id = IDS_SAD_TAB_OOM_MESSAGE;
message_ = CreateLabel(l10n_util::GetStringUTF16(message_id));
@@ -248,8 +251,15 @@ void SadTabView::OnPaint(gfx::Canvas* canvas) {
switch (kind_) {
case chrome::SAD_TAB_KIND_CRASHED: {
static int crashed = 0;
- UMA_HISTOGRAM_CUSTOM_COUNTS(
- "Tabs.SadTab.CrashDisplayed", ++crashed, 1, 1000, 50);
+ crashed++;
+ UMA_HISTOGRAM_COUNTS_1000("Tabs.SadTab.CrashDisplayed", crashed);
+ break;
+ }
+ case chrome::SAD_TAB_KIND_OOM: {
+ static int crashed_due_to_oom = 0;
+ crashed_due_to_oom++;
+ UMA_HISTOGRAM_COUNTS_1000(
+ "Tabs.SadTab.OomDisplayed", crashed_due_to_oom);
break;
}
case chrome::SAD_TAB_KIND_KILLED:
« no previous file with comments | « chrome/browser/ui/sad_tab_types.h ('k') | components/new_or_sad_tab_strings.grdp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698