diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:22:15 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:22:15 +0000 |
| commit | 2b7c9492e9a8794e2124da62bfce91fe3a1b2a77 (patch) | |
| tree | f13a5c7961e2655f63916216223d16fa86454a3d /app/app_base.gypi | |
| parent | 010e37516995713253daa8df6f7ba1c2b12ccd1d (diff) | |
| download | chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.zip chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.tar.gz chromium_src-2b7c9492e9a8794e2124da62bfce91fe3a1b2a77.tar.bz2 | |
Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::.
TEST=try bots compile
BUG=NONE
Review URL: http://codereview.chromium.org/3165064
TBR=bryeung@chromium.org
TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3361003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app_base.gypi')
| -rw-r--r-- | app/app_base.gypi | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi index adefed77..f02d190 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -116,6 +116,8 @@ 'drag_drop_types_gtk.cc', 'drag_drop_types_win.cc', 'drag_drop_types.h', + 'event_synthesis_gtk.cc', + 'event_synthesis_gtk.h', 'file_download_interface.h', 'gfx/font_util.h', 'gfx/font_util.cc', @@ -144,6 +146,17 @@ 'gtk_signal_registrar.h', 'gtk_util.cc', 'gtk_util.h', + 'keyboard_code_conversion.cc', + 'keyboard_code_conversion.h', + 'keyboard_code_conversion_gtk.cc', + 'keyboard_code_conversion_gtk.h', + 'keyboard_code_conversion_mac.mm', + 'keyboard_code_conversion_mac.h', + 'keyboard_code_conversion_win.cc', + 'keyboard_code_conversion_win.h', + 'keyboard_codes.h', + 'keyboard_codes_win.h', + 'keyboard_codes_posix.h', 'l10n_util.cc', 'l10n_util.h', 'l10n_util_mac.h', @@ -305,6 +318,11 @@ '<(gl_binding_output_dir)/gl_bindings_autogen_glx.cc', '<(gl_binding_output_dir)/gl_bindings_autogen_glx.h', ], + 'sources!': [ + 'keyboard_code_conversion_mac.mm', + 'keyboard_code_conversion_mac.h', + 'keyboard_codes_win.h', + ], 'include_dirs': [ # We don't use angle, but pull the EGL/GLES headers from there. '../third_party/angle/include', @@ -330,6 +348,13 @@ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', ], }, + 'sources!': [ + 'event_synthesis_gtk.cc', + 'event_synthesis_gtk.h', + 'keyboard_code_conversion_gtk.cc', + 'keyboard_code_conversion_gtk.h', + 'keyboard_codes_win.h', + ], }], ['OS=="win"', { 'include_dirs': [ @@ -343,6 +368,15 @@ '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.cc', '<(gl_binding_output_dir)/gl_bindings_autogen_wgl.h', ], + 'sources!': [ + 'event_synthesis_gtk.cc', + 'event_synthesis_gtk.h', + 'keyboard_code_conversion_gtk.cc', + 'keyboard_code_conversion_gtk.h', + 'keyboard_code_conversion_mac.mm', + 'keyboard_code_conversion_mac.h', + 'keyboard_codes_posix.h', + ], }], ], }, |