summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/base/keycodes/keyboard_code_conversion_mac.h9
-rw-r--r--ui/base/l10n/l10n_util_mac.h75
-rw-r--r--ui/base/models/accelerator_cocoa.h3
-rw-r--r--ui/gfx/mac/nsimage_cache.h4
-rw-r--r--ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h4
5 files changed, 50 insertions, 45 deletions
diff --git a/ui/base/keycodes/keyboard_code_conversion_mac.h b/ui/base/keycodes/keyboard_code_conversion_mac.h
index 6668d4e..167f162 100644
--- a/ui/base/keycodes/keyboard_code_conversion_mac.h
+++ b/ui/base/keycodes/keyboard_code_conversion_mac.h
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "ui/base/keycodes/keyboard_codes_posix.h"
+#include "ui/ui_api.h"
namespace ui {
@@ -25,10 +26,10 @@ namespace ui {
// This function is mainly for simulating keyboard events in unit tests.
// See third_party/WebKit/Source/WebKit/chromium/src/mac/WebInputEventFactory.mm for
// reverse conversion.
-int MacKeyCodeForWindowsKeyCode(KeyboardCode keycode,
- NSUInteger flags,
- unichar* character,
- unichar* characterIgnoringModifiers);
+UI_API int MacKeyCodeForWindowsKeyCode(KeyboardCode keycode,
+ NSUInteger flags,
+ unichar* character,
+ unichar* characterIgnoringModifiers);
} // namespace ui
diff --git a/ui/base/l10n/l10n_util_mac.h b/ui/base/l10n/l10n_util_mac.h
index 73eaee6..cbf251d 100644
--- a/ui/base/l10n/l10n_util_mac.h
+++ b/ui/base/l10n/l10n_util_mac.h
@@ -11,6 +11,7 @@
#include "base/basictypes.h"
#include "base/string16.h"
+#include "ui/ui_api.h"
#ifdef __OBJC__
@class NSString;
@@ -23,59 +24,59 @@ 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.
-NSString* FixUpWindowsStyleLabel(const string16& label);
+UI_API NSString* FixUpWindowsStyleLabel(const string16& label);
// Pulls resource string from the string bundle and returns it.
-NSString* GetNSString(int message_id);
+UI_API NSString* GetNSString(int message_id);
// Get a resource string and replace $1-$2-$3 with |a| and |b|
// respectively. Additionally, $$ is replaced by $.
-NSString* GetNSStringF(int message_id,
- const string16& a);
-NSString* GetNSStringF(int message_id,
- const string16& a,
- const string16& b);
-NSString* GetNSStringF(int message_id,
- const string16& a,
- const string16& b,
- const string16& c);
-NSString* GetNSStringF(int message_id,
- const string16& a,
- const string16& b,
- const string16& c,
- const string16& d);
+UI_API NSString* GetNSStringF(int message_id,
+ const string16& a);
+UI_API NSString* GetNSStringF(int message_id,
+ const string16& a,
+ const string16& b);
+UI_API NSString* GetNSStringF(int message_id,
+ const string16& a,
+ const string16& b,
+ const string16& c);
+UI_API NSString* GetNSStringF(int message_id,
+ const string16& a,
+ const string16& b,
+ const string16& c,
+ const string16& d);
// Variants that return the offset(s) of the replaced parameters. (See
// app/l10n_util.h for more details.)
-NSString* GetNSStringF(int message_id,
- const string16& a,
- const string16& b,
- std::vector<size_t>* offsets);
+UI_API NSString* GetNSStringF(int message_id,
+ const string16& a,
+ const string16& b,
+ std::vector<size_t>* offsets);
// Same as GetNSString, but runs the result through FixUpWindowsStyleLabel
// before returning it.
-NSString* GetNSStringWithFixup(int message_id);
+UI_API NSString* GetNSStringWithFixup(int message_id);
// Same as GetNSStringF, but runs the result through FixUpWindowsStyleLabel
// before returning it.
-NSString* GetNSStringFWithFixup(int message_id,
- const string16& a);
-NSString* GetNSStringFWithFixup(int message_id,
- const string16& a,
- const string16& b);
-NSString* GetNSStringFWithFixup(int message_id,
- const string16& a,
- const string16& b,
- const string16& c);
-NSString* GetNSStringFWithFixup(int message_id,
- const string16& a,
- const string16& b,
- const string16& c,
- const string16& d);
+UI_API NSString* GetNSStringFWithFixup(int message_id,
+ const string16& a);
+UI_API NSString* GetNSStringFWithFixup(int message_id,
+ const string16& a,
+ const string16& b);
+UI_API NSString* GetNSStringFWithFixup(int message_id,
+ const string16& a,
+ const string16& b,
+ const string16& c);
+UI_API NSString* GetNSStringFWithFixup(int message_id,
+ const string16& a,
+ const string16& b,
+ const string16& c,
+ const string16& d);
// Support the override of the locale with the value from Cocoa.
-void OverrideLocaleWithCocoaLocale();
-const std::string& GetLocaleOverride();
+UI_API void OverrideLocaleWithCocoaLocale();
+UI_API const std::string& GetLocaleOverride();
} // namespace l10n_util
diff --git a/ui/base/models/accelerator_cocoa.h b/ui/base/models/accelerator_cocoa.h
index ef44a5d..66438ad 100644
--- a/ui/base/models/accelerator_cocoa.h
+++ b/ui/base/models/accelerator_cocoa.h
@@ -9,6 +9,7 @@
#include <Foundation/Foundation.h>
#include "base/memory/scoped_nsobject.h"
+#include "ui/ui_api.h"
#include "ui/base/models/accelerator.h"
namespace ui {
@@ -17,7 +18,7 @@ namespace ui {
// support for Cocoa key equivalents. Note that the typical use case for this
// class is to initialize it with a string literal, which is why it sends
// |-copy| to the |key_code| paramater in the constructor.
-class AcceleratorCocoa : public Accelerator {
+class UI_API AcceleratorCocoa : public Accelerator {
public:
AcceleratorCocoa();
AcceleratorCocoa(NSString* key_code, NSUInteger mask);
diff --git a/ui/gfx/mac/nsimage_cache.h b/ui/gfx/mac/nsimage_cache.h
index 83179d2..f89a230 100644
--- a/ui/gfx/mac/nsimage_cache.h
+++ b/ui/gfx/mac/nsimage_cache.h
@@ -6,6 +6,8 @@
#define UI_GFX_MAC_NSIMAGE_CACHE_H_
#pragma once
+#include "ui/ui_api.h"
+
#ifdef __OBJC__
@class NSImage;
@class NSString;
@@ -23,7 +25,7 @@ namespace gfx {
// - This should only be called on the main thread.
// - The caller should retain the image if they want to keep it around, as
// the cache could have limit on size/lifetime, etc.
-NSImage* GetCachedImageWithName(NSString* name);
+UI_API NSImage* GetCachedImageWithName(NSString* name);
// Clears the image cache.
void ClearCachedImages(void);
diff --git a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
index 32b428c..05bf5f6 100644
--- a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
+++ b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h
@@ -5,6 +5,7 @@
#ifndef UI_GFX_SCOPED_NS_GRAPHICS_CONTEXT_SAVE_GSTATE_MAC_H_
#define UI_GFX_SCOPED_NS_GRAPHICS_CONTEXT_SAVE_GSTATE_MAC_H_
+#include "ui/ui_api.h"
#include "base/basictypes.h"
#include "base/memory/scoped_nsobject.h"
@@ -12,8 +13,7 @@
namespace gfx {
-// What this class does should be self-evident and self-documenting.
-class ScopedNSGraphicsContextSaveGState {
+class UI_API ScopedNSGraphicsContextSaveGState {
public:
// If |context| is nil, it will use the |+currentContext|.
explicit ScopedNSGraphicsContextSaveGState(NSGraphicsContext* context = nil);
generated by cgit v1.1 at 2025-02-19 07:07:29 +0000