summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/input_method/input_method_manager_impl.h
diff options
context:
space:
mode:
authornona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 08:43:24 +0000
committernona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 08:43:24 +0000
commit799b443b0b3a6834b8a04b1e3d41a7f6cd45357c (patch)
tree3cf04e497025c2db9b28043d097db027dce6174d /chrome/browser/chromeos/input_method/input_method_manager_impl.h
parent1b4a9530d513314e70b01b16e849ec17294b6666 (diff)
downloadchromium_src-799b443b0b3a6834b8a04b1e3d41a7f6cd45357c.zip
chromium_src-799b443b0b3a6834b8a04b1e3d41a7f6cd45357c.tar.gz
chromium_src-799b443b0b3a6834b8a04b1e3d41a7f6cd45357c.tar.bz2
Extract input_method_whitelist.{h|cc} from c/b/chromeos.
This is the 2nd try of https://codereview.chromium.org/12438012/ It turned out that c/b/chromeos/input_methods/input_methods.txt is also used by chromeos side. So keeping c/b/chromeos/input_methods/input_methods.txt as is for migration and after change is in chromeos tree, I will remove it. BUG=164375 TEST=None TBR=sky Review URL: https://chromiumcodereview.appspot.com/13042007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191325 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/input_method_manager_impl.h')
-rw-r--r--chrome/browser/chromeos/input_method/input_method_manager_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
index 00b67a0..abaae6d 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -15,8 +15,8 @@
#include "chrome/browser/chromeos/input_method/ibus_controller.h"
#include "chrome/browser/chromeos/input_method/input_method_manager.h"
#include "chrome/browser/chromeos/input_method/input_method_util.h"
-#include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
#include "chromeos/ime/ibus_daemon_controller.h"
+#include "chromeos/ime/input_method_whitelist.h"
namespace chromeos {
class InputMethodEngineIBus;