diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 08:43:24 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-29 08:43:24 +0000 |
| commit | 799b443b0b3a6834b8a04b1e3d41a7f6cd45357c (patch) | |
| tree | 3cf04e497025c2db9b28043d097db027dce6174d /chrome/chrome_browser_chromeos.gypi | |
| parent | 1b4a9530d513314e70b01b16e849ec17294b6666 (diff) | |
| download | chromium_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/chrome_browser_chromeos.gypi')
| -rw-r--r-- | chrome/chrome_browser_chromeos.gypi | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index ee12ef2..d8d516a 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -24,7 +24,6 @@ # TODO(tbarzic): Cleanup this list. 'app/policy/cloud_policy_codegen.gyp:policy', 'browser_extensions', - 'browser/chromeos/input_method/input_method.gyp:gencode', 'browser/performance_monitor/performance_monitor.gyp:performance_monitor', 'cert_logger_proto', 'chrome_resources.gyp:chrome_extra_resources', @@ -50,6 +49,7 @@ '../components/components.gyp:autofill_regexes', '../content/content.gyp:content_browser', '../content/content.gyp:content_common', + '../chromeos/ime/input_method.gyp:gencode', '../crypto/crypto.gyp:crypto', '../dbus/dbus.gyp:dbus', '../device/device.gyp:device_bluetooth', @@ -349,8 +349,6 @@ 'browser/chromeos/input_method/input_method_util.h', 'browser/chromeos/input_method/component_extension_ime_manager_impl.cc', 'browser/chromeos/input_method/component_extension_ime_manager_impl.h', - 'browser/chromeos/input_method/input_method_whitelist.cc', - 'browser/chromeos/input_method/input_method_whitelist.h', 'browser/chromeos/input_method/mock_ibus_controller.cc', 'browser/chromeos/input_method/mock_ibus_controller.h', 'browser/chromeos/input_method/xkeyboard.cc', |