Index: ui/base/ime/win/tsf_input_scope.h |
diff --git a/ui/base/ime/win/tsf_input_scope.h b/ui/base/ime/win/tsf_input_scope.h |
index 2e5856c60d839e7e17ce37f4d06516d87655bb34..536d395dce1482449a65604ed693713a00bb5e7d 100644 |
--- a/ui/base/ime/win/tsf_input_scope.h |
+++ b/ui/base/ime/win/tsf_input_scope.h |
@@ -12,7 +12,7 @@ |
#include "base/basictypes.h" |
#include "ui/base/ime/text_input_mode.h" |
#include "ui/base/ime/text_input_type.h" |
-#include "ui/base/ui_export.h" |
+#include "ui/base/ui_base_export.h" |
namespace ui { |
namespace tsf_inputscope { |
@@ -20,8 +20,9 @@ namespace tsf_inputscope { |
// Returns InputScope list corresoponding to ui::TextInputType and |
// ui::TextInputMode. |
// This function is only used from following functions but declared for test. |
-UI_EXPORT std::vector<InputScope> GetInputScopes(TextInputType text_input_type, |
- TextInputMode text_input_mode); |
+UI_BASE_EXPORT std::vector<InputScope> GetInputScopes( |
+ TextInputType text_input_type, |
+ TextInputMode text_input_mode); |
// Returns an instance of ITfInputScope, which is the Windows-specific |
// category representation corresponding to ui::TextInputType and |
@@ -29,14 +30,14 @@ UI_EXPORT std::vector<InputScope> GetInputScopes(TextInputType text_input_type, |
// in the target field. |
// The returned instance has 0 reference count. The caller must maintain its |
// reference count. |
-UI_EXPORT ITfInputScope* CreateInputScope(TextInputType text_input_type, |
- TextInputMode text_input_mode); |
+UI_BASE_EXPORT ITfInputScope* CreateInputScope(TextInputType text_input_type, |
+ TextInputMode text_input_mode); |
// A wrapper of the SetInputScopes API exported by msctf.dll. |
// http://msdn.microsoft.com/en-us/library/windows/desktop/ms629026.aspx |
// Does nothing on Windows XP in case TSF is disabled. |
// NOTE: For TSF-aware window, you should use ITfInputScope instead. |
-UI_EXPORT void SetInputScopeForTsfUnawareWindow( |
+UI_BASE_EXPORT void SetInputScopeForTsfUnawareWindow( |
HWND window_handle, |
TextInputType text_input_type, |
TextInputMode text_input_mode); |