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

Side by Side Diff: ui/base/ime/win/mock_tsf_bridge.cc

Issue 14698032: Make InputMethodWin TSF-aware. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Implement OnTextLayoutChanged in MockTSFBridge. Created 7 years, 7 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 | « ui/base/ime/win/mock_tsf_bridge.h ('k') | ui/base/ime/win/tsf_bridge.h » ('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) 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 #include "ui/base/ime/win/mock_tsf_bridge.h" 5 #include "ui/base/ime/win/mock_tsf_bridge.h"
6 6
7 #include "ui/base/ime/text_input_client.h" 7 #include "ui/base/ime/text_input_client.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 9
10 namespace ui { 10 namespace ui {
(...skipping 20 matching lines...) Expand all
31 31
32 bool MockTSFBridge::CancelComposition() { 32 bool MockTSFBridge::CancelComposition() {
33 ++cancel_composition_call_count_; 33 ++cancel_composition_call_count_;
34 return true; 34 return true;
35 } 35 }
36 36
37 void MockTSFBridge::OnTextInputTypeChanged(TextInputClient* client) { 37 void MockTSFBridge::OnTextInputTypeChanged(TextInputClient* client) {
38 latest_text_input_type_ = client->GetTextInputType(); 38 latest_text_input_type_ = client->GetTextInputType();
39 } 39 }
40 40
41 void MockTSFBridge::OnTextLayoutChanged() {
42 ++on_text_layout_changed_;
43 }
44
41 void MockTSFBridge::SetFocusedClient(HWND focused_window, 45 void MockTSFBridge::SetFocusedClient(HWND focused_window,
42 TextInputClient* client) { 46 TextInputClient* client) {
43 ++set_focused_client_call_count_; 47 ++set_focused_client_call_count_;
44 focused_window_ = focused_window; 48 focused_window_ = focused_window;
45 text_input_client_ = client; 49 text_input_client_ = client;
46 } 50 }
47 51
48 void MockTSFBridge::RemoveFocusedClient(TextInputClient* client) { 52 void MockTSFBridge::RemoveFocusedClient(TextInputClient* client) {
49 ++remove_focused_client_call_count_; 53 ++remove_focused_client_call_count_;
50 DCHECK_EQ(client, text_input_client_); 54 DCHECK_EQ(client, text_input_client_);
51 text_input_client_ = NULL; 55 text_input_client_ = NULL;
52 focused_window_ = NULL; 56 focused_window_ = NULL;
53 } 57 }
54 58
55 base::win::ScopedComPtr<ITfThreadMgr> MockTSFBridge::GetThreadManager() { 59 base::win::ScopedComPtr<ITfThreadMgr> MockTSFBridge::GetThreadManager() {
56 return thread_manager_; 60 return thread_manager_;
57 } 61 }
58 62
59 TextInputClient* MockTSFBridge::GetFocusedTextInputClient() const { 63 TextInputClient* MockTSFBridge::GetFocusedTextInputClient() const {
60 return text_input_client_; 64 return text_input_client_;
61 } 65 }
62 66
63 void MockTSFBridge::Reset() { 67 void MockTSFBridge::Reset() {
64 shutdown_call_count_ = 0; 68 shutdown_call_count_ = 0;
65 enable_ime_call_count_ = 0; 69 enable_ime_call_count_ = 0;
66 disalbe_ime_call_count_ = 0; 70 disalbe_ime_call_count_ = 0;
67 cancel_composition_call_count_ = 0; 71 cancel_composition_call_count_ = 0;
72 on_text_layout_changed_ = 0;
68 associate_focus_call_count_ = 0; 73 associate_focus_call_count_ = 0;
69 set_focused_client_call_count_ = 0; 74 set_focused_client_call_count_ = 0;
70 remove_focused_client_call_count_ = 0; 75 remove_focused_client_call_count_ = 0;
71 text_input_client_ = NULL; 76 text_input_client_ = NULL;
72 focused_window_ = NULL; 77 focused_window_ = NULL;
73 latest_text_input_type_ = TEXT_INPUT_TYPE_NONE; 78 latest_text_input_type_ = TEXT_INPUT_TYPE_NONE;
74 } 79 }
75 80
76 } // namespace ui 81 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/ime/win/mock_tsf_bridge.h ('k') | ui/base/ime/win/tsf_bridge.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698