Index: ui/base/l10n/l10n_util_win.h |
diff --git a/ui/base/l10n/l10n_util_win.h b/ui/base/l10n/l10n_util_win.h |
index d0338f7807e4cafd1fa56ee58226f265302bb021..75bfe5db03a8c1059e3734dbc8ddb26ac9f76ccd 100644 |
--- a/ui/base/l10n/l10n_util_win.h |
+++ b/ui/base/l10n/l10n_util_win.h |
@@ -10,7 +10,7 @@ |
#include <vector> |
#include "base/strings/string16.h" |
-#include "ui/base/ui_export.h" |
+#include "ui/base/ui_base_export.h" |
namespace l10n_util { |
@@ -19,17 +19,17 @@ namespace l10n_util { |
// (e.g. WS_EX_LAYOUTRTL, WS_EX_RTLREADING, etc.) when creating a window. |
// Callers should OR this value into their extended style value when creating |
// a window. |
-UI_EXPORT int GetExtendedStyles(); |
+UI_BASE_EXPORT int GetExtendedStyles(); |
// TODO(xji): |
// This is a temporary name, it will eventually replace GetExtendedStyles |
-UI_EXPORT int GetExtendedTooltipStyles(); |
+UI_BASE_EXPORT int GetExtendedTooltipStyles(); |
// Give an HWND, this function sets the WS_EX_LAYOUTRTL extended style for the |
// underlying window. When this style is set, the UI for the window is going to |
// be mirrored. This is generally done for the UI of right-to-left languages |
// such as Hebrew. |
-UI_EXPORT void HWNDSetRTLLayout(HWND hwnd); |
+UI_BASE_EXPORT void HWNDSetRTLLayout(HWND hwnd); |
// See http://blogs.msdn.com/oldnewthing/archive/2005/09/15/467598.aspx |
// and http://blogs.msdn.com/oldnewthing/archive/2006/06/26/647365.aspx |
@@ -40,14 +40,15 @@ UI_EXPORT void HWNDSetRTLLayout(HWND hwnd); |
// override_font_family and font_size_scaler are not null, they'll be |
// filled with the font family name and the size scaler. The output |
// parameters are not modified if the return value is false. |
-UI_EXPORT bool NeedOverrideDefaultUIFont(base::string16* override_font_family, |
- double* font_size_scaler); |
+UI_BASE_EXPORT bool NeedOverrideDefaultUIFont( |
+ base::string16* override_font_family, |
+ double* font_size_scaler); |
// If the default UI font stored in |logfont| is not suitable, its family |
// and size are replaced with those stored in the per-locale resource. The |
// font size is adjusted based on the font scale setting in the OS preferences. |
// Windows 8 supports scale factors of 1, 1.4 and 1.8. |
-UI_EXPORT void AdjustUIFont(LOGFONT* logfont); |
+UI_BASE_EXPORT void AdjustUIFont(LOGFONT* logfont); |
// If the default UI font stored in |logfont| is not suitable, its family |
// and size are replaced with those stored in the per-locale resource. The |
@@ -55,17 +56,17 @@ UI_EXPORT void AdjustUIFont(LOGFONT* logfont); |
// baseline of 96 DPI. This ratio is also used for converting sizes from |
// device independent pixels (DIP) to physical pixels. The font size is scaled |
// for use with Views and Aura which work in DIP. |
-UI_EXPORT void AdjustUIFontForDIP(float dpi_scale, LOGFONT* logfont); |
+UI_BASE_EXPORT void AdjustUIFontForDIP(float dpi_scale, LOGFONT* logfont); |
// If the font for a given window (pointed to by HWND) is not suitable for the |
// UI in the current UI langauge, its family and size are replaced with those |
// stored in the per-locale resource. |
-UI_EXPORT void AdjustUIFontForWindow(HWND hwnd); |
+UI_BASE_EXPORT void AdjustUIFontForWindow(HWND hwnd); |
// Allow processes to override the configured locale with the user's Windows UI |
// languages. This function should generally be called once early in |
// Application startup. |
-UI_EXPORT void OverrideLocaleWithUILanguageList(); |
+UI_BASE_EXPORT void OverrideLocaleWithUILanguageList(); |
// Retrieve the locale override, or an empty vector if the locale has not been |
// or failed to be overridden. |