| Index: ui/base/ime/input_method_factory.h
|
| diff --git a/ui/base/ime/input_method_factory.h b/ui/base/ime/input_method_factory.h
|
| index 616e860036199845b16be1211fc79457051f8f7e..b170f146426f1f2f33ea7db29696a3e450aa89d7 100644
|
| --- a/ui/base/ime/input_method_factory.h
|
| +++ b/ui/base/ime/input_method_factory.h
|
| @@ -9,7 +9,7 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "ui/base/ime/input_method_initializer.h"
|
| -#include "ui/base/ui_export.h"
|
| +#include "ui/base/ui_base_export.h"
|
| #include "ui/gfx/native_widget_types.h"
|
|
|
| namespace ui {
|
| @@ -20,19 +20,19 @@ class InputMethodDelegate;
|
| class InputMethod;
|
|
|
| // Creates a new instance of InputMethod and returns it.
|
| -UI_EXPORT scoped_ptr<InputMethod> CreateInputMethod(
|
| +UI_BASE_EXPORT scoped_ptr<InputMethod> CreateInputMethod(
|
| internal::InputMethodDelegate* delegate,
|
| gfx::AcceleratedWidget widget);
|
|
|
| // Makes CreateInputMethod return a MockInputMethod.
|
| -UI_EXPORT void SetUpInputMethodFactoryForTesting();
|
| +UI_BASE_EXPORT void SetUpInputMethodFactoryForTesting();
|
|
|
| #if defined(OS_WIN)
|
| // Returns a shared input method object for the platform. Caller must not
|
| // delete the object. Currently supported only on Windows. This method is
|
| // for non-Aura environment, where only one input method object is created for
|
| // the browser process.
|
| -UI_EXPORT InputMethod* GetSharedInputMethod();
|
| +UI_BASE_EXPORT InputMethod* GetSharedInputMethod();
|
|
|
| namespace internal {
|
| // Destroys the shared input method object returned by GetSharedInputMethod().
|
|
|