OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/chromeos/cros/input_method_library.h" | 5 #include "chrome/browser/chromeos/cros/input_method_library.h" |
6 | 6 |
7 #include <glib.h> | 7 #include <glib.h> |
8 #include <signal.h> | 8 #include <signal.h> |
9 | 9 |
10 #include "unicode/uloc.h" | 10 #include "unicode/uloc.h" |
11 | 11 |
12 #include "base/basictypes.h" | 12 #include "base/basictypes.h" |
13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
15 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/browser_thread.h" | |
17 #include "chrome/browser/chromeos/cros/cros_library.h" | 16 #include "chrome/browser/chromeos/cros/cros_library.h" |
18 #include "chrome/browser/chromeos/cros/keyboard_library.h" | 17 #include "chrome/browser/chromeos/cros/keyboard_library.h" |
19 #include "chrome/browser/chromeos/input_method/candidate_window.h" | 18 #include "chrome/browser/chromeos/input_method/candidate_window.h" |
20 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 19 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
21 #include "chrome/browser/chromeos/language_preferences.h" | 20 #include "chrome/browser/chromeos/language_preferences.h" |
22 #include "chrome/common/notification_observer.h" | 21 #include "chrome/common/notification_observer.h" |
23 #include "chrome/common/notification_registrar.h" | 22 #include "chrome/common/notification_registrar.h" |
24 #include "chrome/common/notification_service.h" | 23 #include "chrome/common/notification_service.h" |
| 24 #include "content/browser/browser_thread.h" |
25 | 25 |
26 namespace { | 26 namespace { |
27 | 27 |
28 const char kIBusDaemonPath[] = "/usr/bin/ibus-daemon"; | 28 const char kIBusDaemonPath[] = "/usr/bin/ibus-daemon"; |
29 | 29 |
30 // Finds a property which has |new_prop.key| from |prop_list|, and replaces the | 30 // Finds a property which has |new_prop.key| from |prop_list|, and replaces the |
31 // property with |new_prop|. Returns true if such a property is found. | 31 // property with |new_prop|. Returns true if such a property is found. |
32 bool FindAndUpdateProperty(const chromeos::ImeProperty& new_prop, | 32 bool FindAndUpdateProperty(const chromeos::ImeProperty& new_prop, |
33 chromeos::ImePropertyList* prop_list) { | 33 chromeos::ImePropertyList* prop_list) { |
34 for (size_t i = 0; i < prop_list->size(); ++i) { | 34 for (size_t i = 0; i < prop_list->size(); ++i) { |
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1085 } | 1085 } |
1086 return impl; | 1086 return impl; |
1087 } | 1087 } |
1088 } | 1088 } |
1089 | 1089 |
1090 } // namespace chromeos | 1090 } // namespace chromeos |
1091 | 1091 |
1092 // Allows InvokeLater without adding refcounting. This class is a Singleton and | 1092 // Allows InvokeLater without adding refcounting. This class is a Singleton and |
1093 // won't be deleted until it's last InvokeLater is run. | 1093 // won't be deleted until it's last InvokeLater is run. |
1094 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::InputMethodLibraryImpl); | 1094 DISABLE_RUNNABLE_METHOD_REFCOUNT(chromeos::InputMethodLibraryImpl); |
OLD | NEW |