Rename enums/functions that collide in chromium style.

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

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 1068 matching lines @@
 String LayoutThemeMac::fileListNameForWidth(Locale& locale, const FileList* fileList, const Font& font, int width) const
 {
     if (width <= 0)
         return String();
 
     String strToTruncate;
     if (fileList->isEmpty()) {
         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();
     } else {
         // FIXME: Localization of fileList->length().
         return StringTruncator::rightTruncate(locale.queryString(WebLocalizedString::MultipleFileUploadText, String::number(fileList->length())), width, font);
     }
 
     return StringTruncator::centerTruncate(strToTruncate, width, font);
 }
@@ skipping 69 matching lines @@
 
 bool LayoutThemeMac::shouldUseFallbackTheme(const ComputedStyle& style) const
 {
     ControlPart part = style.appearance();
     if (part == CheckboxPart || part == RadioPart)
         return style.effectiveZoom() != 1;
     return false;
 }
 
 } // namespace blink