Index: base/mac/mac_util.h |
=================================================================== |
--- base/mac/mac_util.h (revision 95578) |
+++ base/mac/mac_util.h (working copy) |
@@ -10,7 +10,7 @@ |
#include <Carbon/Carbon.h> |
#include <string> |
-#include "base/base_api.h" |
+#include "base/base_export.h" |
#include "base/logging.h" |
// TODO(rohitrao): Clean up sites that include mac_util.h and remove this line. |
@@ -40,22 +40,22 @@ |
kFullScreenModeNormal = 10, |
}; |
-BASE_API std::string PathFromFSRef(const FSRef& ref); |
-BASE_API bool FSRefFromPath(const std::string& path, FSRef* ref); |
+BASE_EXPORT std::string PathFromFSRef(const FSRef& ref); |
+BASE_EXPORT bool FSRefFromPath(const std::string& path, FSRef* ref); |
// Returns an sRGB color space. The return value is a static value; do not |
// release it! |
-BASE_API CGColorSpaceRef GetSRGBColorSpace(); |
+BASE_EXPORT CGColorSpaceRef GetSRGBColorSpace(); |
// Returns the color space being used by the main display. The return value |
// is a static value; do not release it! |
-BASE_API CGColorSpaceRef GetSystemColorSpace(); |
+BASE_EXPORT CGColorSpaceRef GetSystemColorSpace(); |
// Add a full screen request for the given |mode|. Must be paired with a |
// ReleaseFullScreen() call for the same |mode|. This does not by itself create |
// a fullscreen window; rather, it manages per-application state related to |
// hiding the dock and menubar. Must be called on the main thread. |
-BASE_API void RequestFullScreen(FullScreenMode mode); |
+BASE_EXPORT void RequestFullScreen(FullScreenMode mode); |
// Release a request for full screen mode. Must be matched with a |
// RequestFullScreen() call for the same |mode|. As with RequestFullScreen(), |
@@ -63,45 +63,45 @@ |
// state. For example, if there are no other outstanding |
// |kFullScreenModeAutoHideAll| requests, this will reshow the menu bar. Must |
// be called on main thread. |
-BASE_API void ReleaseFullScreen(FullScreenMode mode); |
+BASE_EXPORT void ReleaseFullScreen(FullScreenMode mode); |
// Convenience method to switch the current fullscreen mode. This has the same |
// net effect as a ReleaseFullScreen(from_mode) call followed immediately by a |
// RequestFullScreen(to_mode). Must be called on the main thread. |
-BASE_API void SwitchFullScreenModes(FullScreenMode from_mode, |
- FullScreenMode to_mode); |
+BASE_EXPORT void SwitchFullScreenModes(FullScreenMode from_mode, |
+ FullScreenMode to_mode); |
// Set the visibility of the cursor. |
-BASE_API void SetCursorVisibility(bool visible); |
+BASE_EXPORT void SetCursorVisibility(bool visible); |
// Should windows miniaturize on a double-click (on the title bar)? |
-BASE_API bool ShouldWindowsMiniaturizeOnDoubleClick(); |
+BASE_EXPORT bool ShouldWindowsMiniaturizeOnDoubleClick(); |
// Activates the process with the given PID. |
-BASE_API void ActivateProcess(pid_t pid); |
+BASE_EXPORT void ActivateProcess(pid_t pid); |
// Returns true if this process is in the foreground, meaning that it's the |
// frontmost process, the one whose menu bar is shown at the top of the main |
// display. |
-BASE_API bool AmIForeground(); |
+BASE_EXPORT bool AmIForeground(); |
// Excludes the file given by |file_path| from being backed up by Time Machine. |
-BASE_API bool SetFileBackupExclusion(const FilePath& file_path); |
+BASE_EXPORT bool SetFileBackupExclusion(const FilePath& file_path); |
// Sets the process name as displayed in Activity Monitor to process_name. |
-BASE_API void SetProcessName(CFStringRef process_name); |
+BASE_EXPORT void SetProcessName(CFStringRef process_name); |
// Converts a NSImage to a CGImageRef. Normally, the system frameworks can do |
// this fine, especially on 10.6. On 10.5, however, CGImage cannot handle |
// converting a PDF-backed NSImage into a CGImageRef. This function will |
// rasterize the PDF into a bitmap CGImage. The caller is responsible for |
// releasing the return value. |
-BASE_API CGImageRef CopyNSImageToCGImage(NSImage* image); |
+BASE_EXPORT CGImageRef CopyNSImageToCGImage(NSImage* image); |
// Checks if the current application is set as a Login Item, so it will launch |
// on Login. If a non-NULL pointer to is_hidden is passed, the Login Item also |
// is queried for the 'hide on launch' flag. |
-BASE_API bool CheckLoginItemStatus(bool* is_hidden); |
+BASE_EXPORT bool CheckLoginItemStatus(bool* is_hidden); |
// Adds current application to the set of Login Items with specified "hide" |
// flag. This has the same effect as adding/removing the application in |
@@ -109,14 +109,14 @@ |
// as "Options->Open on Login". |
// Does nothing if the application is already set up as Login Item with |
// specified hide flag. |
-BASE_API void AddToLoginItems(bool hide_on_startup); |
+BASE_EXPORT void AddToLoginItems(bool hide_on_startup); |
// Removes the current application from the list Of Login Items. |
-BASE_API void RemoveFromLoginItems(); |
+BASE_EXPORT void RemoveFromLoginItems(); |
// Returns true if the current process was automatically launched as a |
// 'Login Item' with 'hide on startup' flag. Used to suppress opening windows. |
-BASE_API bool WasLaunchedAsHiddenLoginItem(); |
+BASE_EXPORT bool WasLaunchedAsHiddenLoginItem(); |
// Run-time OS version checks. Use these instead of |
// base::SysInfo::OperatingSystemVersionNumbers. Prefer the "OrEarlier" and |
@@ -124,22 +124,22 @@ |
// know for sure that you need to check for a specific version. |
// Leopard is Mac OS X 10.5, Darwin 9. |
-BASE_API bool IsOSLeopard(); |
-BASE_API bool IsOSLeopardOrEarlier(); |
+BASE_EXPORT bool IsOSLeopard(); |
+BASE_EXPORT bool IsOSLeopardOrEarlier(); |
// Snow Leopard is Mac OS X 10.6, Darwin 10. |
-BASE_API bool IsOSSnowLeopard(); |
-BASE_API bool IsOSSnowLeopardOrEarlier(); |
-BASE_API bool IsOSSnowLeopardOrLater(); |
+BASE_EXPORT bool IsOSSnowLeopard(); |
+BASE_EXPORT bool IsOSSnowLeopardOrEarlier(); |
+BASE_EXPORT bool IsOSSnowLeopardOrLater(); |
// Lion is Mac OS X 10.7, Darwin 11. |
-BASE_API bool IsOSLion(); |
-BASE_API bool IsOSLionOrLater(); |
+BASE_EXPORT bool IsOSLion(); |
+BASE_EXPORT bool IsOSLionOrLater(); |
// This should be infrequently used. It only makes sense to use this to avoid |
// codepaths that are very likely to break on future (unreleased, untested, |
// unborn) OS releases. |
-BASE_API bool IsOSLaterThanLion(); |
+BASE_EXPORT bool IsOSLaterThanLion(); |
// When the deployment target is set, the code produced cannot run on earlier |
// OS releases. That enables some of the IsOS* family to be implemented as |