third_party/WebKit/Source/core/html/LinkResource.h - Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/.

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/core/html/LinkResource.h

Issue 1740483004: Rename enums/functions that collide in chromium style in core/html/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-5

Patch Set: get-names-6: . Created 4 years, 10 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/core/html/LinkRelAttributeTest.cpp ('k') | third_party/WebKit/Source/core/html/MediaError.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/LinkResource.h

diff --git a/third_party/WebKit/Source/core/html/LinkResource.h b/third_party/WebKit/Source/core/html/LinkResource.h

index e38203f419d0a8b289d4285a45ffdfad66ba8edb..7599d920560e0918089ff3414825f4dbab9ef34f 100644

--- a/third_party/WebKit/Source/core/html/LinkResource.h

+++ b/third_party/WebKit/Source/core/html/LinkResource.h

@@ -44,7 +44,7 @@ class LocalFrame;

class LinkResource : public NoBaseWillBeGarbageCollectedFinalized<LinkResource> {

WTF_MAKE_NONCOPYABLE(LinkResource); USING_FAST_MALLOC_WILL_BE_REMOVED(LinkResource);

public:

- enum Type {

+ enum LinkResourceType {

Style,

Import,

Manifest

@@ -56,7 +56,7 @@ public:

bool shouldLoadResource() const;

LocalFrame* loadingFrame() const;

- virtual Type type() const = 0;

+ virtual LinkResourceType type() const = 0;

virtual void process() = 0;

virtual void ownerRemoved() { }

virtual void ownerInserted() { }

« no previous file with comments | « third_party/WebKit/Source/core/html/LinkRelAttributeTest.cpp ('k') | third_party/WebKit/Source/core/html/MediaError.h » ('j') | no next file with comments »