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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h

Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-3
Patch Set: get-names-4: 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
Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
index eb38835c4c9b085469eaedd10bca3cd7bedc0a1e..576bab5bd3b7c1fcc3dd0a2b52ce19202b6aaa5c 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
@@ -79,7 +79,7 @@ public:
// FrameOwner overrides:
bool isLocal() const override { return true; }
void dispatchLoad() override;
- SandboxFlags sandboxFlags() const override { return m_sandboxFlags; }
+ SandboxFlags getSandboxFlags() const override { return m_sandboxFlags; }
void renderFallbackContent() override { }
ScrollbarMode scrollingMode() const override { return ScrollbarAuto; }
int marginWidth() const override { return -1; }

Powered by Google App Engine
This is Rietveld 408576698