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

Side by Side Diff: ui/base/ime/input_method_imm32.cc

Issue 149073009: Remove InputMethodTSF, TSFEventRouter, TSFTextStore, TSFBridge (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . 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 | Annotate | Revision Log
« no previous file with comments | « ui/base/ime/input_method_factory.cc ('k') | ui/base/ime/input_method_initializer.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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #include "ui/base/ime/input_method_imm32.h" 5 #include "ui/base/ime/input_method_imm32.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "ui/base/ime/composition_text.h" 8 #include "ui/base/ime/composition_text.h"
9 #include "ui/base/ime/text_input_client.h" 9 #include "ui/base/ime/text_input_client.h"
10 #include "ui/base/ime/win/tsf_input_scope.h"
11 10
12 11
13 namespace ui { 12 namespace ui {
14 13
15 InputMethodIMM32::InputMethodIMM32(internal::InputMethodDelegate* delegate, 14 InputMethodIMM32::InputMethodIMM32(internal::InputMethodDelegate* delegate,
16 HWND toplevel_window_handle) 15 HWND toplevel_window_handle)
17 : InputMethodWin(delegate, toplevel_window_handle), 16 : InputMethodWin(delegate, toplevel_window_handle),
18 enabled_(false), is_candidate_popup_open_(false), 17 enabled_(false), is_candidate_popup_open_(false),
19 composing_window_handle_(NULL) { 18 composing_window_handle_(NULL) {
20 // In non-Aura environment, appropriate callbacks to OnFocus() and OnBlur() 19 // In non-Aura environment, appropriate callbacks to OnFocus() and OnBlur()
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 imm32_manager_.DisableIME(window_handle); 284 imm32_manager_.DisableIME(window_handle);
286 enabled_ = false; 285 enabled_ = false;
287 break; 286 break;
288 default: 287 default:
289 imm32_manager_.EnableIME(window_handle); 288 imm32_manager_.EnableIME(window_handle);
290 enabled_ = true; 289 enabled_ = true;
291 break; 290 break;
292 } 291 }
293 292
294 imm32_manager_.SetTextInputMode(window_handle, text_input_mode); 293 imm32_manager_.SetTextInputMode(window_handle, text_input_mode);
295 tsf_inputscope::SetInputScopeForTsfUnawareWindow(
yukawa 2014/01/30 03:56:09 Could you revert changes in this file? Actually we
scottmg 2014/01/30 04:18:14 Oops, thanks. Done.
296 window_handle, text_input_type, text_input_mode);
297 } 294 }
298 295
299 } // namespace ui 296 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/ime/input_method_factory.cc ('k') | ui/base/ime/input_method_initializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698