diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 18:10:18 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 18:10:18 +0000 |
| commit | 3c56b38d2055b16592d499ea4933c27cbb0fd809 (patch) | |
| tree | 82c593ce4c84e4d0c538d10cd89da3f001ac67c7 /content/content_browser.gypi | |
| parent | 03eb9d27a79f876a039ca30eba54d1155ab5500b (diff) | |
| download | chromium_src-3c56b38d2055b16592d499ea4933c27cbb0fd809.zip chromium_src-3c56b38d2055b16592d499ea4933c27cbb0fd809.tar.gz chromium_src-3c56b38d2055b16592d499ea4933c27cbb0fd809.tar.bz2 | |
content: Move render_widget_host_view_gtk to content/ try 2.
This was r97750, which was reverted at r97756. This patch, in addition to all
the other things it did, marks OwnedWidgetGtk for export and moves it to the
ui:: namespace.
Original list of things this patch does:
- OwnedWidgetGtk now goes in ui/base/gtk/
- TruncateString moved from l10n_util:: to ui::
- GtkIMContextWrapper has part of its code split into chrome/ (IDC using code goes in RenderViewContextMenu) and the rest go in content/ (gtk using code goes with GtkIMContextWrapper).
- gtk_key_bindings_handler[_unittest] now goes in content, as it's a utility class to RenderWidgetHostGtk.
BUG=93804
TEST=existing unit tests
Original Review URL: http://codereview.chromium.org/7669040
Review URL: http://codereview.chromium.org/7708021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_browser.gypi')
| -rw-r--r-- | content/content_browser.gypi | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 6231386..0f554c6 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -324,6 +324,10 @@ 'browser/renderer_host/global_request_id.h', 'browser/renderer_host/gpu_message_filter.cc', 'browser/renderer_host/gpu_message_filter.h', + 'browser/renderer_host/gtk_im_context_wrapper.cc', + 'browser/renderer_host/gtk_im_context_wrapper.h', + 'browser/renderer_host/gtk_key_bindings_handler.cc', + 'browser/renderer_host/gtk_key_bindings_handler.h', 'browser/renderer_host/media/audio_common.cc', 'browser/renderer_host/media/audio_common.h', 'browser/renderer_host/media/audio_input_device_manager.cc', @@ -388,6 +392,8 @@ 'browser/renderer_host/render_widget_host_mac.cc', 'browser/renderer_host/render_widget_host_view.cc', 'browser/renderer_host/render_widget_host_view.h', + 'browser/renderer_host/render_widget_host_view_gtk.cc', + 'browser/renderer_host/render_widget_host_view_gtk.h', 'browser/renderer_host/resource_dispatcher_host.cc', 'browser/renderer_host/resource_dispatcher_host.h', 'browser/renderer_host/resource_dispatcher_host_delegate.h', @@ -567,6 +573,20 @@ '../sandbox/sandbox.gyp:sandbox', ], }], + ['chromeos==1', { + 'sources!': [ + 'browser/renderer_host/gtk_key_bindings_handler.cc', + 'browser/renderer_host/gtk_key_bindings_handler.h', + ], + }], + ['touchui==1', { + 'sources/': [ + ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'], + ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'], + ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'], + ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'], + ], + }], ], }, ], |