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

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

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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/dummy_text_input_client.cc ('k') | ui/base/ime/input_method_ibus.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) 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_INPUT_METHOD_IBUS_H_ 5 #ifndef UI_BASE_IME_INPUT_METHOD_IBUS_H_
6 #define UI_BASE_IME_INPUT_METHOD_IBUS_H_ 6 #define UI_BASE_IME_INPUT_METHOD_IBUS_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 std::set<uint32> pending_key_events_; 125 std::set<uint32> pending_key_events_;
126 126
127 // Pending composition text generated by the current pending key event. 127 // Pending composition text generated by the current pending key event.
128 // It'll be sent to the focused text input client as soon as we receive the 128 // It'll be sent to the focused text input client as soon as we receive the
129 // processing result of the pending key event. 129 // processing result of the pending key event.
130 CompositionText composition_; 130 CompositionText composition_;
131 131
132 // Pending result text generated by the current pending key event. 132 // Pending result text generated by the current pending key event.
133 // It'll be sent to the focused text input client as soon as we receive the 133 // It'll be sent to the focused text input client as soon as we receive the
134 // processing result of the pending key event. 134 // processing result of the pending key event.
135 string16 result_text_; 135 base::string16 result_text_;
136 136
137 string16 previous_surrounding_text_; 137 base::string16 previous_surrounding_text_;
138 gfx::Range previous_selection_range_; 138 gfx::Range previous_selection_range_;
139 139
140 // Indicates if input context is focused or not. 140 // Indicates if input context is focused or not.
141 bool context_focused_; 141 bool context_focused_;
142 142
143 // Indicates if there is an ongoing composition text. 143 // Indicates if there is an ongoing composition text.
144 bool composing_text_; 144 bool composing_text_;
145 145
146 // Indicates if the composition text is changed or deleted. 146 // Indicates if the composition text is changed or deleted.
147 bool composition_changed_; 147 bool composition_changed_;
(...skipping 13 matching lines...) Expand all
161 161
162 // Used for making callbacks. 162 // Used for making callbacks.
163 base::WeakPtrFactory<InputMethodIBus> weak_ptr_factory_; 163 base::WeakPtrFactory<InputMethodIBus> weak_ptr_factory_;
164 164
165 DISALLOW_COPY_AND_ASSIGN(InputMethodIBus); 165 DISALLOW_COPY_AND_ASSIGN(InputMethodIBus);
166 }; 166 };
167 167
168 } // namespace ui 168 } // namespace ui
169 169
170 #endif // UI_BASE_IME_INPUT_METHOD_IBUS_H_ 170 #endif // UI_BASE_IME_INPUT_METHOD_IBUS_H_
OLDNEW
« no previous file with comments | « ui/base/ime/dummy_text_input_client.cc ('k') | ui/base/ime/input_method_ibus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698