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

Unified Diff: app/app_base.gypi

Issue 3361003: Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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
« no previous file with comments | « no previous file | app/event_synthesis_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/app_base.gypi
===================================================================
--- app/app_base.gypi (revision 58386)
+++ app/app_base.gypi (working copy)
@@ -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',
+ ],
}],
],
},
« no previous file with comments | « no previous file | app/event_synthesis_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698