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 "chromeos/ime/ibus_daemon_controller.h" | 5 #include "chromeos/ime/ibus_daemon_controller.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/chromeos/chromeos_version.h" | 8 #include "base/chromeos/chromeos_version.h" |
9 #include "base/environment.h" | 9 #include "base/environment.h" |
10 #include "base/files/file_path_watcher.h" | 10 #include "base/files/file_path_watcher.h" |
11 #include "base/location.h" | 11 #include "base/location.h" |
12 #include "base/logging.h" | 12 #include "base/logging.h" |
13 #include "base/observer_list.h" | 13 #include "base/observer_list.h" |
14 #include "base/process_util.h" | 14 #include "base/process_util.h" |
15 #include "base/rand_util.h" | 15 #include "base/rand_util.h" |
16 #include "base/string_util.h" | 16 #include "base/strings/string_util.h" |
17 #include "base/stringprintf.h" | 17 #include "base/strings/stringprintf.h" |
18 #include "base/threading/thread_checker.h" | 18 #include "base/threading/thread_checker.h" |
19 #include "chromeos/dbus/dbus_thread_manager.h" | 19 #include "chromeos/dbus/dbus_thread_manager.h" |
20 | 20 |
21 namespace chromeos { | 21 namespace chromeos { |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 IBusDaemonController* g_ibus_daemon_controller = NULL; | 25 IBusDaemonController* g_ibus_daemon_controller = NULL; |
26 base::FilePathWatcher* g_file_path_watcher = NULL; | 26 base::FilePathWatcher* g_file_path_watcher = NULL; |
27 | 27 |
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
349 delete g_ibus_daemon_controller; | 349 delete g_ibus_daemon_controller; |
350 g_ibus_daemon_controller = NULL; | 350 g_ibus_daemon_controller = NULL; |
351 } | 351 } |
352 | 352 |
353 // static | 353 // static |
354 IBusDaemonController* IBusDaemonController::GetInstance() { | 354 IBusDaemonController* IBusDaemonController::GetInstance() { |
355 return g_ibus_daemon_controller; | 355 return g_ibus_daemon_controller; |
356 } | 356 } |
357 | 357 |
358 } // namespace chromeos | 358 } // namespace chromeos |
OLD | NEW |