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

Side by Side Diff: ui/base/ime/win/tsf_input_scope.h

Issue 21157006: change tsf_input_scopes::SetInputScopeForTsfUnawareWindow to SetInputScopesForTsfUnawareWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove singleton and add thread checking Created 7 years, 4 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WIN_TSF_INPUT_SCOPE_H_ 5 #ifndef UI_BASE_IME_WIN_TSF_INPUT_SCOPE_H_
6 #define UI_BASE_IME_WIN_TSF_INPUT_SCOPE_H_ 6 #define UI_BASE_IME_WIN_TSF_INPUT_SCOPE_H_
7 7
8 #include <Windows.h> 8 #include <Windows.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "ui/base/ime/text_input_mode.h"
11 #include "ui/base/ime/text_input_type.h" 12 #include "ui/base/ime/text_input_type.h"
12 #include "ui/base/ui_export.h" 13 #include "ui/base/ui_export.h"
13 14
14 struct ITfInputScope; 15 struct ITfInputScope;
15 16
16 namespace ui { 17 namespace ui {
17 namespace tsf_inputscope { 18 namespace tsf_inputscope {
18 19
19 // Returns an instance of ITfInputScope, which is the Windows-specific 20 // Returns an instance of ITfInputScope, which is the Windows-specific
20 // category representation corresponding to ui::TextInputType that we are 21 // category representation corresponding to ui::TextInputType that we are
21 // using to specify the expected text type in the target field. 22 // using to specify the expected text type in the target field.
22 // The returned instance has 0 reference count. The caller must maintain its 23 // The returned instance has 0 reference count. The caller must maintain its
23 // reference count. 24 // reference count.
24 UI_EXPORT ITfInputScope* CreateInputScope(TextInputType text_input_type); 25 UI_EXPORT ITfInputScope* CreateInputScope(TextInputType text_input_type);
25 26
26 // A wrapper of the SetInputScope API exported by msctf.dll. 27 // A wrapper of the SetInputScopes API exported by msctf.dll.
27 // http://msdn.microsoft.com/en-us/library/windows/desktop/ms629025.aspx 28 // http://msdn.microsoft.com/en-us/library/windows/desktop/
Yohei Yukawa 2013/08/05 08:25:50 I prefer http://msdn.microsoft.com/en-us/library/w
yoichio 2013/08/05 08:30:41 Done.
29 // ms629026(v=vs.85).aspx
28 // Does nothing on Windows XP in case TSF is disabled. 30 // Does nothing on Windows XP in case TSF is disabled.
29 // NOTE: For TSF-aware window, you should use ITfInputScope instead. 31 // NOTE: For TSF-aware window, you should use ITfInputScope instead.
30 UI_EXPORT void SetInputScopeForTsfUnawareWindow( 32 UI_EXPORT void SetInputScopeForTsfUnawareWindow(
31 HWND window_handle, 33 HWND window_handle,
32 TextInputType text_input_type); 34 TextInputType text_input_type,
35 TextInputMode text_input_mode);
33 36
34 } // namespace tsf_inputscope 37 } // namespace tsf_inputscope
35 } // namespace ui 38 } // namespace ui
36 39
37 #endif // UI_BASE_IME_WIN_TSF_INPUT_SCOPE_H_ 40 #endif // UI_BASE_IME_WIN_TSF_INPUT_SCOPE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698