diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 17:26:49 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-29 17:26:49 +0000 |
commit | 4e402ae2d4b7ce8194f690b40fe147a3b3c01c6c (patch) | |
tree | da7cafa293a030e763239b707618cd22246e6840 /ui/base | |
parent | f6ed3df0b70c1e148d8ebd05ae437d72fc69aee8 (diff) | |
download | chromium_src-4e402ae2d4b7ce8194f690b40fe147a3b3c01c6c.zip chromium_src-4e402ae2d4b7ce8194f690b40fe147a3b3c01c6c.tar.gz chromium_src-4e402ae2d4b7ce8194f690b40fe147a3b3c01c6c.tar.bz2 |
mac: Components build for ui, easy part
BUG=90078
TEST=none
Review URL: http://codereview.chromium.org/7531019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base')
-rw-r--r-- | ui/base/keycodes/keyboard_code_conversion_mac.h | 9 | ||||
-rw-r--r-- | ui/base/l10n/l10n_util_mac.h | 75 | ||||
-rw-r--r-- | ui/base/models/accelerator_cocoa.h | 3 |
3 files changed, 45 insertions, 42 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); |