summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 01:42:59 +0000
committermattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-14 01:42:59 +0000
commit671c2f73b7de30853bd29af54ae0a81afa1a7470 (patch)
tree5bc9902f255fb7ff640d4a3264b6a46ef175fc85
parentee241cd6778aacf5210c69db393d5b87fea33762 (diff)
downloadchromium_src-671c2f73b7de30853bd29af54ae0a81afa1a7470.zip
chromium_src-671c2f73b7de30853bd29af54ae0a81afa1a7470.tar.gz
chromium_src-671c2f73b7de30853bd29af54ae0a81afa1a7470.tar.bz2
Fix linux_view build including both render_widget_host_view_gtk and render_widget_host_view_views.
BUG=none TEST=build with GYP_DEFINES="toolkit_views=1 library=shared_library" Review URL: http://codereview.chromium.org/3751003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62495 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome_browser.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1919dfa..6bbebcf 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3338,6 +3338,8 @@
'sources!': [
'browser/dom_ui/keyboard_ui.cc',
'browser/dom_ui/keyboard_ui.h',
+ 'browser/renderer_host/render_widget_host_view_views.cc',
+ 'browser/renderer_host/render_widget_host_view_views.h',
],
}],
['touchui==1', {
@@ -3611,8 +3613,6 @@
'browser/importer/nss_decryptor_system_nss.cc',
'browser/importer/nss_decryptor_system_nss.h',
'browser/power_save_blocker_stub.cc',
- 'browser/renderer_host/render_widget_host_view_views.cc',
- 'browser/renderer_host/render_widget_host_view_views.h',
'browser/views/select_file_dialog.cc',
],
'conditions': [