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

Side by Side Diff: views/ime/input_method_ibus.h

Issue 8491035: Revert 109583 - Move views/ime/text_input_client.h to ui/base/ime/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | « views/ime/input_method_gtk.cc ('k') | views/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) 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 VIEWS_IME_INPUT_METHOD_IBUS_H_ 5 #ifndef VIEWS_IME_INPUT_METHOD_IBUS_H_
6 #define VIEWS_IME_INPUT_METHOD_IBUS_H_ 6 #define VIEWS_IME_INPUT_METHOD_IBUS_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "ui/base/glib/glib_integers.h" 15 #include "ui/base/glib/glib_integers.h"
16 #include "ui/base/glib/glib_signal.h" 16 #include "ui/base/glib/glib_signal.h"
17 #include "ui/base/ime/character_composer.h" 17 #include "ui/base/ime/character_composer.h"
18 #include "ui/base/ime/composition_text.h"
19 #include "ui/base/ime/text_input_client.h"
20 #include "views/events/event.h" 18 #include "views/events/event.h"
21 #include "views/ime/input_method_base.h" 19 #include "views/ime/input_method_base.h"
22 #include "views/view.h" 20 #include "views/view.h"
23 21
24 // Forward declarations, so that we don't need to include ibus.h in this file. 22 // Forward declarations, so that we don't need to include ibus.h in this file.
25 typedef struct _GAsyncResult GAsyncResult; 23 typedef struct _GAsyncResult GAsyncResult;
26 typedef struct _IBusBus IBusBus; 24 typedef struct _IBusBus IBusBus;
27 typedef struct _IBusInputContext IBusInputContext; 25 typedef struct _IBusInputContext IBusInputContext;
28 typedef struct _IBusText IBusText; 26 typedef struct _IBusText IBusText;
29 27
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // An object to compose a character from a sequence of key presses 200 // An object to compose a character from a sequence of key presses
203 // including dead key etc. 201 // including dead key etc.
204 ui::CharacterComposer character_composer_; 202 ui::CharacterComposer character_composer_;
205 203
206 DISALLOW_COPY_AND_ASSIGN(InputMethodIBus); 204 DISALLOW_COPY_AND_ASSIGN(InputMethodIBus);
207 }; 205 };
208 206
209 } // namespace views 207 } // namespace views
210 208
211 #endif // VIEWS_IME_INPUT_METHOD_IBUS_H_ 209 #endif // VIEWS_IME_INPUT_METHOD_IBUS_H_
OLDNEW
« no previous file with comments | « views/ime/input_method_gtk.cc ('k') | views/ime/input_method_ibus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698