Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Unified Diff: trunk/src/chrome/chrome_browser_chromeos.gypi

Issue 12453021: Revert 190596 "Extract input_method_whitelist.{h|cc} from c/b/ch..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/chrome_browser_chromeos.gypi
===================================================================
--- trunk/src/chrome/chrome_browser_chromeos.gypi (revision 190642)
+++ trunk/src/chrome/chrome_browser_chromeos.gypi (working copy)
@@ -24,6 +24,7 @@
# 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',
@@ -49,7 +50,6 @@
'../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',
@@ -347,6 +347,8 @@
'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',
« no previous file with comments | « trunk/src/chrome/browser/chromeos/input_method/xkeyboard_unittest.cc ('k') | trunk/src/chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698