OLD | NEW |
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 "chrome/browser/chromeos/input_method/ibus_controller_impl.h" | 5 #include "chrome/browser/chromeos/input_method/ibus_controller_impl.h" |
6 | 6 |
7 #include <algorithm> // for std::reverse. | 7 #include <algorithm> // for std::reverse. |
8 #include <cstdio> | 8 #include <cstdio> |
9 #include <cstring> // for std::strcmp. | 9 #include <cstring> // for std::strcmp. |
10 #include <set> | 10 #include <set> |
11 #include <sstream> | 11 #include <sstream> |
12 #include <stack> | 12 #include <stack> |
13 #include <utility> | 13 #include <utility> |
14 | 14 |
15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
16 #include "base/bind.h" | 16 #include "base/bind.h" |
17 #include "base/environment.h" | 17 #include "base/environment.h" |
18 #include "base/files/file_path_watcher.h" | 18 #include "base/files/file_path_watcher.h" |
19 #include "base/memory/scoped_ptr.h" | 19 #include "base/memory/scoped_ptr.h" |
20 #include "base/message_loop.h" | 20 #include "base/message_loop.h" |
21 #include "base/rand_util.h" | 21 #include "base/rand_util.h" |
22 #include "base/string_split.h" | |
23 #include "base/stringprintf.h" | 22 #include "base/stringprintf.h" |
| 23 #include "base/strings/string_split.h" |
24 #include "chrome/browser/chromeos/input_method/input_method_config.h" | 24 #include "chrome/browser/chromeos/input_method/input_method_config.h" |
25 #include "chrome/browser/chromeos/input_method/input_method_property.h" | 25 #include "chrome/browser/chromeos/input_method/input_method_property.h" |
26 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 26 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
27 #include "chromeos/dbus/dbus_thread_manager.h" | 27 #include "chromeos/dbus/dbus_thread_manager.h" |
28 #include "chromeos/dbus/ibus/ibus_client.h" | 28 #include "chromeos/dbus/ibus/ibus_client.h" |
29 #include "chromeos/dbus/ibus/ibus_config_client.h" | 29 #include "chromeos/dbus/ibus/ibus_config_client.h" |
30 #include "chromeos/dbus/ibus/ibus_constants.h" | 30 #include "chromeos/dbus/ibus/ibus_constants.h" |
31 #include "chromeos/dbus/ibus/ibus_input_context_client.h" | 31 #include "chromeos/dbus/ibus/ibus_input_context_client.h" |
32 #include "chromeos/dbus/ibus/ibus_panel_service.h" | 32 #include "chromeos/dbus/ibus/ibus_panel_service.h" |
33 #include "chromeos/dbus/ibus/ibus_property.h" | 33 #include "chromeos/dbus/ibus/ibus_property.h" |
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
601 | 601 |
602 // static | 602 // static |
603 bool IBusControllerImpl::FindAndUpdatePropertyForTesting( | 603 bool IBusControllerImpl::FindAndUpdatePropertyForTesting( |
604 const chromeos::input_method::InputMethodProperty& new_prop, | 604 const chromeos::input_method::InputMethodProperty& new_prop, |
605 chromeos::input_method::InputMethodPropertyList* prop_list) { | 605 chromeos::input_method::InputMethodPropertyList* prop_list) { |
606 return FindAndUpdateProperty(new_prop, prop_list); | 606 return FindAndUpdateProperty(new_prop, prop_list); |
607 } | 607 } |
608 | 608 |
609 } // namespace input_method | 609 } // namespace input_method |
610 } // namespace chromeos | 610 } // namespace chromeos |
OLD | NEW |