content/child/blink_platform_impl.h - Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink.

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: content/child/blink_platform_impl.h

Issue 1504913002: Revert of Enforce marking "override" for functions overriding Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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 | « content/browser/android/in_process/context_provider_in_process.cc ('k') | content/child/service_worker/service_worker_dispatcher_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/child/blink_platform_impl.h

diff --git a/content/child/blink_platform_impl.h b/content/child/blink_platform_impl.h

index c77dd9a25a6021cd5b2bd25820cf4492d3b1df04..b6850f240182a02f202f9a11d9fe730c57b76dce 100644

--- a/content/child/blink_platform_impl.h

+++ b/content/child/blink_platform_impl.h

@@ -119,7 +119,7 @@

const char* category_name) override;

TraceEventAPIAtomicWord* getTraceSamplingState(

const unsigned thread_bucket) override;

- TraceEventHandle addTraceEvent(

+ virtual TraceEventHandle addTraceEvent(

char phase,

const unsigned char* category_group_enabled,

const char* name,

@@ -131,7 +131,7 @@

const unsigned char* arg_types,

const unsigned long long* arg_values,

blink::WebConvertableToTraceFormat* convertable_values,

- unsigned int flags) override;

+ unsigned int flags);

virtual TraceEventHandle addTraceEvent(

char phase,

const unsigned char* category_group_enabled,