Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Side by Side Diff: ui/base/ime/input_method_factory.h

Issue 158483003: Logically revert r206996, which is no longer used in the era of Aura (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | ui/base/ime/input_method_factory.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_BASE_IME_INPUT_METHOD_FACTORY_H_ 5 #ifndef UI_BASE_IME_INPUT_METHOD_FACTORY_H_
6 #define UI_BASE_IME_INPUT_METHOD_FACTORY_H_ 6 #define UI_BASE_IME_INPUT_METHOD_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "ui/base/ime/input_method_initializer.h" 11 #include "ui/base/ime/input_method_initializer.h"
12 #include "ui/base/ui_base_export.h" 12 #include "ui/base/ui_base_export.h"
13 #include "ui/gfx/native_widget_types.h" 13 #include "ui/gfx/native_widget_types.h"
14 14
15 namespace ui { 15 namespace ui {
16 namespace internal { 16 namespace internal {
17 class InputMethodDelegate; 17 class InputMethodDelegate;
18 } // namespace internal 18 } // namespace internal
19 19
20 class InputMethod; 20 class InputMethod;
21 21
22 // Creates a new instance of InputMethod and returns it. 22 // Creates a new instance of InputMethod and returns it.
23 UI_BASE_EXPORT scoped_ptr<InputMethod> CreateInputMethod( 23 UI_BASE_EXPORT scoped_ptr<InputMethod> CreateInputMethod(
24 internal::InputMethodDelegate* delegate, 24 internal::InputMethodDelegate* delegate,
25 gfx::AcceleratedWidget widget); 25 gfx::AcceleratedWidget widget);
26 26
27 // Makes CreateInputMethod return a MockInputMethod. 27 // Makes CreateInputMethod return a MockInputMethod.
28 UI_BASE_EXPORT void SetUpInputMethodFactoryForTesting(); 28 UI_BASE_EXPORT void SetUpInputMethodFactoryForTesting();
29 29
30 #if defined(OS_WIN)
31 // Returns a shared input method object for the platform. Caller must not
32 // delete the object. Currently supported only on Windows. This method is
33 // for non-Aura environment, where only one input method object is created for
34 // the browser process.
35 UI_BASE_EXPORT InputMethod* GetSharedInputMethod();
36
37 namespace internal {
38 // Destroys the shared input method object returned by GetSharedInputMethod().
39 // This function must be called only from input_method_initializer.cc.
40 void DestroySharedInputMethod();
41 } // namespace internal
42 #endif
43
44 } // namespace ui; 30 } // namespace ui;
45 31
46 #endif // UI_BASE_IME_INPUT_METHOD_FACTORY_H_ 32 #endif // UI_BASE_IME_INPUT_METHOD_FACTORY_H_
OLDNEW
« no previous file with comments | « no previous file | ui/base/ime/input_method_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698