Rename UI_API to UI_EXPORT.
[email protected]
Review URL: http://codereview.chromium.org/7569005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95730 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ui/base/win/hwnd_util.h b/ui/base/win/hwnd_util.h
index a5bef49..f46e4c7 100644
--- a/ui/base/win/hwnd_util.h
+++ b/ui/base/win/hwnd_util.h
@@ -9,7 +9,7 @@
#include <windows.h>
#include "base/string16.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
namespace gfx {
class Size;
@@ -19,35 +19,35 @@
// A version of the GetClassNameW API that returns the class name in an
// string16. An empty result indicates a failure to get the class name.
-UI_API string16 GetClassName(HWND hwnd);
+UI_EXPORT string16 GetClassName(HWND hwnd);
// Useful for subclassing a HWND. Returns the previous window procedure.
-UI_API WNDPROC SetWindowProc(HWND hwnd, WNDPROC wndproc);
+UI_EXPORT WNDPROC SetWindowProc(HWND hwnd, WNDPROC wndproc);
// Pointer-friendly wrappers around Get/SetWindowLong(..., GWLP_USERDATA, ...)
// Returns the previously set value.
-UI_API void* SetWindowUserData(HWND hwnd, void* user_data);
-UI_API void* GetWindowUserData(HWND hwnd);
+UI_EXPORT void* SetWindowUserData(HWND hwnd, void* user_data);
+UI_EXPORT void* GetWindowUserData(HWND hwnd);
// Returns true if the specified window is the current active top window or one
// of its children.
-UI_API bool DoesWindowBelongToActiveWindow(HWND window);
+UI_EXPORT bool DoesWindowBelongToActiveWindow(HWND window);
// Sizes the window to have a client or window size (depending on the value of
// |pref_is_client|) of pref, then centers the window over parent, ensuring the
// window fits on screen.
-UI_API void CenterAndSizeWindow(HWND parent,
- HWND window,
- const gfx::Size& pref,
- bool pref_is_client);
+UI_EXPORT void CenterAndSizeWindow(HWND parent,
+ HWND window,
+ const gfx::Size& pref,
+ bool pref_is_client);
// If |hwnd| is NULL logs various thing and CHECKs. Invoke right after calling
// CreateWindow.
-UI_API void CheckWindowCreated(HWND hwnd);
+UI_EXPORT void CheckWindowCreated(HWND hwnd);
// Shows the system menu for |window| and sends the selected command (if the
// user selected something.
-UI_API void ShowSystemMenu(HWND window, int screen_x, int screen_y);
+UI_EXPORT void ShowSystemMenu(HWND window, int screen_x, int screen_y);
} // namespace ui
diff --git a/ui/base/win/ime_input.h b/ui/base/win/ime_input.h
index 887a5c3..ad0e517 100644
--- a/ui/base/win/ime_input.h
+++ b/ui/base/win/ime_input.h
@@ -15,7 +15,7 @@
#include "base/i18n/rtl.h"
#include "base/string16.h"
#include "ui/gfx/rect.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
namespace ui {
@@ -74,7 +74,7 @@
// hand, we can NEVER disable either TSF or CUAS in Windows Vista, i.e.
// THIS CLASS IS NOT ONLY USED ON THE INPUT CONTEXTS OF EAST-ASIAN
// LANGUAGES BUT ALSO USED ON THE INPUT CONTEXTS OF ALL LANGUAGES.
-class UI_API ImeInput {
+class UI_EXPORT ImeInput {
public:
ImeInput();
~ImeInput();
diff --git a/ui/base/win/shell.h b/ui/base/win/shell.h
index 359954e..8fe8642c 100644
--- a/ui/base/win/shell.h
+++ b/ui/base/win/shell.h
@@ -9,7 +9,7 @@
#include <windows.h>
#include "base/string16.h"
-#include "ui/ui_api.h"
+#include "ui/base/ui_export.h"
class FilePath;
@@ -20,12 +20,12 @@
// default application registered for the file specified by 'full_path',
// ask the user, via the Windows "Open With" dialog.
// Returns 'true' on successful open, 'false' otherwise.
-UI_API bool OpenItemViaShell(const FilePath& full_path);
+UI_EXPORT bool OpenItemViaShell(const FilePath& full_path);
// The download manager now writes the alternate data stream with the
// zone on all downloads. This function is equivalent to OpenItemViaShell
// without showing the zone warning dialog.
-UI_API bool OpenItemViaShellNoZoneCheck(const FilePath& full_path);
+UI_EXPORT bool OpenItemViaShellNoZoneCheck(const FilePath& full_path);
// Ask the user, via the Windows "Open With" dialog, for an application to use
// to open the file specified by 'full_path'.
@@ -35,7 +35,7 @@
// Sets the application id given as the Application Model ID for the window
// specified. This method is used to insure that different web applications
// do not group together on the Win7 task bar.
-UI_API void SetAppIdForWindow(const string16& app_id, HWND hwnd);
+UI_EXPORT void SetAppIdForWindow(const string16& app_id, HWND hwnd);
} // namespace win
} // namespace ui
diff --git a/ui/base/win/window_impl.h b/ui/base/win/window_impl.h
index 863c484..d60fd1e 100644
--- a/ui/base/win/window_impl.h
+++ b/ui/base/win/window_impl.h
@@ -14,9 +14,9 @@
#include <string>
#include "base/logging.h"
+#include "ui/base/ui_export.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
-#include "ui/ui_api.h"
namespace ui {
@@ -41,7 +41,7 @@
// Windows.
//
///////////////////////////////////////////////////////////////////////////////
-class UI_API WindowImpl : public MessageMapInterface {
+class UI_EXPORT WindowImpl : public MessageMapInterface {
public:
WindowImpl();
virtual ~WindowImpl();
