ui: Rename ui_export.h to ui_base_export.h

ui/base/l10n/l10n_util_mac.h

Index: ui/base/l10n/l10n_util_mac.h
diff --git a/ui/base/l10n/l10n_util_mac.h b/ui/base/l10n/l10n_util_mac.h
index b2a88ce9a9b1378281fb7099d32c8a4f337402f0..74bc58b49351d381ead9fd6cac35b74773e54808 100644
--- a/ui/base/l10n/l10n_util_mac.h
+++ b/ui/base/l10n/l10n_util_mac.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
-#include "ui/base/ui_export.h"
+#include "ui/base/ui_base_export.h"
 
 #ifdef __OBJC__
 @class NSString;
@@ -23,59 +23,58 @@ namespace l10n_util {
 // Remove the Windows-style accelerator marker (for labels, menuitems, etc.)
 // and change "..." into an ellipsis.
 // Returns the result in an autoreleased NSString.
-UI_EXPORT NSString* FixUpWindowsStyleLabel(const base::string16& label);
+UI_BASE_EXPORT NSString* FixUpWindowsStyleLabel(const base::string16& label);
 
 // Pulls resource string from the string bundle and returns it.
-UI_EXPORT NSString* GetNSString(int message_id);
+UI_BASE_EXPORT NSString* GetNSString(int message_id);
 
 // Get a resource string and replace $1-$2-$3 with |a| and |b|
 // respectively.  Additionally, $$ is replaced by $.
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a);
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a,
-                                 const base::string16& b);
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a,
-                                 const base::string16& b,
-                                 const base::string16& c);
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a,
-                                 const base::string16& b,
-                                 const base::string16& c,
-                                 const base::string16& d);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id, const base::string16& a);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id,
+                                      const base::string16& a,
+                                      const base::string16& b);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id,
+                                      const base::string16& a,
+                                      const base::string16& b,
+                                      const base::string16& c);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id,
+                                      const base::string16& a,
+                                      const base::string16& b,
+                                      const base::string16& c,
+                                      const base::string16& d);
 
 // Variants that return the offset(s) of the replaced parameters. (See
 // app/l10n_util.h for more details.)
-UI_EXPORT NSString* GetNSStringF(int message_id,
-                                 const base::string16& a,
-                                 const base::string16& b,
-                                 std::vector<size_t>* offsets);
+UI_BASE_EXPORT NSString* GetNSStringF(int message_id,
+                                      const base::string16& a,
+                                      const base::string16& b,
+                                      std::vector<size_t>* offsets);
 
 // Same as GetNSString, but runs the result through FixUpWindowsStyleLabel
 // before returning it.
-UI_EXPORT NSString* GetNSStringWithFixup(int message_id);
+UI_BASE_EXPORT NSString* GetNSStringWithFixup(int message_id);
 
 // Same as GetNSStringF, but runs the result through FixUpWindowsStyleLabel
 // before returning it.
-UI_EXPORT NSString* GetNSStringFWithFixup(int message_id,
-                                          const base::string16& a);
-UI_EXPORT NSString* GetNSStringFWithFixup(int message_id,
-                                          const base::string16& a,
-                                          const base::string16& b);
-UI_EXPORT NSString* GetNSStringFWithFixup(int message_id,
-                                          const base::string16& a,
-                                          const base::string16& b,
-                                          const base::string16& c);
-UI_EXPORT NSString* GetNSStringFWithFixup(int message_id,
-                                          const base::string16& a,
-                                          const base::string16& b,
-                                          const base::string16& c,
-                                          const base::string16& d);
+UI_BASE_EXPORT NSString* GetNSStringFWithFixup(int message_id,
+                                               const base::string16& a);
+UI_BASE_EXPORT NSString* GetNSStringFWithFixup(int message_id,
+                                               const base::string16& a,
+                                               const base::string16& b);
+UI_BASE_EXPORT NSString* GetNSStringFWithFixup(int message_id,
+                                               const base::string16& a,
+                                               const base::string16& b,
+                                               const base::string16& c);
+UI_BASE_EXPORT NSString* GetNSStringFWithFixup(int message_id,
+                                               const base::string16& a,
+                                               const base::string16& b,
+                                               const base::string16& c,
+                                               const base::string16& d);
 
 // Support the override of the locale with the value from Cocoa.
-UI_EXPORT void OverrideLocaleWithCocoaLocale();
-UI_EXPORT const std::string& GetLocaleOverride();
+UI_BASE_EXPORT void OverrideLocaleWithCocoaLocale();
+UI_BASE_EXPORT const std::string& GetLocaleOverride();
 
 }  // namespace l10n_util