third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp - Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

Issue 2611823003: ABANDONED CL: Changes to compile and pass tests after Big Blink Rename (excluding functions). (Closed)

Patch Set: Inducing merge conflicts to force human review and changes after rename. Created 3 years, 11 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 | « third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.cpp ('k') | third_party/WebKit/Source/platform/heap/BlinkGC.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

diff --git a/third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp b/third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

index 00ba58c1a6114778667138e89eb1e88e5d3e96e8..817fa6251d40b614e606036098cfbedc199c5088 100644

--- a/third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

+++ b/third_party/WebKit/Source/modules/notifications/NotificationImageLoader.cpp

@@ -21,7 +21,7 @@

#include <memory>

#define NOTIFICATION_PER_TYPE_HISTOGRAM_COUNTS(metric, type_name, value, max) \

- case NotificationImageLoader::Type::type_name: { \

+ case NotificationImageLoader::Type::k##type_name: { \

DEFINE_THREAD_SAFE_STATIC_LOCAL( \

CustomCountHistogram, metric##type_name##Histogram, \

new CustomCountHistogram("Notifications." #metric "." #type_name, \

@@ -30,6 +30,8 @@

break; \

}

+ /* DO NOT SUBMIT - conflict resolution helper:

+ * Important to have Image instead of kImage below. */

#define NOTIFICATION_HISTOGRAM_COUNTS(metric, type, value, max) \

switch (type) { \

NOTIFICATION_PER_TYPE_HISTOGRAM_COUNTS(metric, Image, value, max) \