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

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

Issue 61003004: Delete ibus_object and move ibus_text to chromeos/ime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modified based on the review. Created 7 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
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/input_method_ibus.h" 5 #include "ui/base/ime/input_method_ibus.h"
6 6
7 #include <X11/X.h> 7 #include <X11/X.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 #include <X11/Xutil.h> 9 #include <X11/Xutil.h>
10 #undef FocusIn 10 #undef FocusIn
11 #undef FocusOut 11 #undef FocusOut
12 12
13 #include <algorithm> 13 #include <algorithm>
14 #include <cstring> 14 #include <cstring>
15 #include <set> 15 #include <set>
16 #include <vector> 16 #include <vector>
17 17
18 #include "base/basictypes.h" 18 #include "base/basictypes.h"
19 #include "base/bind.h" 19 #include "base/bind.h"
20 #include "base/i18n/char_iterator.h" 20 #include "base/i18n/char_iterator.h"
21 #include "base/logging.h" 21 #include "base/logging.h"
22 #include "base/strings/string_util.h" 22 #include "base/strings/string_util.h"
23 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
24 #include "base/third_party/icu/icu_utf.h" 24 #include "base/third_party/icu/icu_utf.h"
25 #include "chromeos/dbus/ibus/ibus_text.h" 25 #include "chromeos/ime/ibus_text.h"
26 #include "chromeos/ime/input_method_descriptor.h" 26 #include "chromeos/ime/input_method_descriptor.h"
27 #include "chromeos/ime/input_method_manager.h" 27 #include "chromeos/ime/input_method_manager.h"
28 #include "ui/base/ime/text_input_client.h" 28 #include "ui/base/ime/text_input_client.h"
29 #include "ui/events/event.h" 29 #include "ui/events/event.h"
30 #include "ui/events/event_constants.h" 30 #include "ui/events/event_constants.h"
31 #include "ui/events/event_utils.h" 31 #include "ui/events/event_utils.h"
32 #include "ui/events/keycodes/keyboard_code_conversion.h" 32 #include "ui/events/keycodes/keyboard_code_conversion.h"
33 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 33 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
34 #include "ui/events/keycodes/keyboard_codes.h" 34 #include "ui/events/keycodes/keyboard_codes.h"
35 #include "ui/gfx/rect.h" 35 #include "ui/gfx/rect.h"
(...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after
880 // |surrounding_text| coordinates. 880 // |surrounding_text| coordinates.
881 if (!GetEngine()) 881 if (!GetEngine())
882 return; 882 return;
883 GetEngine()->SetSurroundingText( 883 GetEngine()->SetSurroundingText(
884 UTF16ToUTF8(surrounding_text), 884 UTF16ToUTF8(surrounding_text),
885 selection_range.start() - text_range.start(), 885 selection_range.start() - text_range.start(),
886 selection_range.end() - text_range.start()); 886 selection_range.end() - text_range.start());
887 } 887 }
888 888
889 } // namespace ui 889 } // namespace ui
OLDNEW
« no previous file with comments | « chromeos/ime/mock_ime_input_context_handler.cc ('k') | ui/base/ime/input_method_ibus_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698