third_party/WebKit/Source/core/layout/LayoutThemeMac.mm - Issue 1738623004: Rename enums/functions that collide in chromium style.

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/layout/LayoutThemeMac.mm

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

Patch Set: get-names-5 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

« third_party/WebKit/Source/core/editing/CaretBase.h ('K') | « third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

diff --git a/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm b/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

index 19fc396aebf860881d190bf34a4d10ba46878ae4..63c17411bd619d18bcd2313f96ac4e2fdd7f7609 100644

--- a/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

+++ b/third_party/WebKit/Source/core/layout/LayoutThemeMac.mm

@@ -1084,7 +1084,7 @@ String LayoutThemeMac::fileListNameForWidth(Locale& locale, const FileList* file

strToTruncate = locale.queryString(WebLocalizedString::FileButtonNoFileSelectedLabel);

} else if (fileList->length() == 1) {

File* file = fileList->item(0);

- if (file->userVisibility() == File::IsUserVisible)

+ if (file->getUserVisibility() == File::IsUserVisible)

strToTruncate = [[NSFileManager defaultManager] displayNameAtPath:(fileList->item(0)->path())];

else

strToTruncate = file->name();