summaryrefslogtreecommitdiffstats
path: root/ui/base/ime/input_method_factory.h
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-06 02:05:32 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-06 02:05:32 +0000
commit9552c2ddb6c18e9c12c3ffad8607e4478362c30c (patch)
treeacb4dffda7bff91f611893fbbd1d2a821fb42bfa /ui/base/ime/input_method_factory.h
parentd9e37818e1d9267582ae13053534a547628e6f9e (diff)
downloadchromium_src-9552c2ddb6c18e9c12c3ffad8607e4478362c30c.zip
chromium_src-9552c2ddb6c18e9c12c3ffad8607e4478362c30c.tar.gz
chromium_src-9552c2ddb6c18e9c12c3ffad8607e4478362c30c.tar.bz2
ui: Rename ui_export.h to ui_base_export.h
Also renames UI_EXPORT to UI_BASE_EXPORT. BUG=299841 TEST=None, no functional changes TBR=ben@chromium.org Review URL: https://codereview.chromium.org/93863005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243050 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/ime/input_method_factory.h')
-rw-r--r--ui/base/ime/input_method_factory.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/base/ime/input_method_factory.h b/ui/base/ime/input_method_factory.h
index 616e860..b170f14 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().