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

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

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 years, 2 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/aura/root_window_host_x11.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) 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/chromeos/chromeos_version.h"
21 #include "base/i18n/char_iterator.h" 20 #include "base/i18n/char_iterator.h"
22 #include "base/logging.h" 21 #include "base/logging.h"
23 #include "base/strings/string_util.h" 22 #include "base/strings/string_util.h"
24 #include "base/strings/utf_string_conversions.h" 23 #include "base/strings/utf_string_conversions.h"
25 #include "base/third_party/icu/icu_utf.h" 24 #include "base/third_party/icu/icu_utf.h"
26 #include "chromeos/dbus/ibus/ibus_text.h" 25 #include "chromeos/dbus/ibus/ibus_text.h"
27 #include "chromeos/ime/input_method_descriptor.h" 26 #include "chromeos/ime/input_method_descriptor.h"
28 #include "chromeos/ime/input_method_manager.h" 27 #include "chromeos/ime/input_method_manager.h"
29 #include "ui/base/ime/text_input_client.h" 28 #include "ui/base/ime/text_input_client.h"
30 #include "ui/events/event.h" 29 #include "ui/events/event.h"
(...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after
787 } 786 }
788 787
789 // Use a black thin underline by default. 788 // Use a black thin underline by default.
790 if (out_composition->underlines.empty()) { 789 if (out_composition->underlines.empty()) {
791 out_composition->underlines.push_back(CompositionUnderline( 790 out_composition->underlines.push_back(CompositionUnderline(
792 0, length, SK_ColorBLACK, false /* thick */)); 791 0, length, SK_ColorBLACK, false /* thick */));
793 } 792 }
794 } 793 }
795 794
796 } // namespace ui 795 } // namespace ui
OLDNEW
« no previous file with comments | « ui/aura/root_window_host_x11.cc ('k') | ui/base/ime/input_method_initializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698