summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 14:53:11 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 14:53:11 +0000
commit76d3f0ea18c2b00e46887e375cff1fd5e6ca6d21 (patch)
tree683c8d51a46577b3edef10ee6ec80bc4725d11ed
parentc2868d7ebb5768236449411ed72060b64520fffd (diff)
downloadchromium_src-76d3f0ea18c2b00e46887e375cff1fd5e6ca6d21.zip
chromium_src-76d3f0ea18c2b00e46887e375cff1fd5e6ca6d21.tar.gz
chromium_src-76d3f0ea18c2b00e46887e375cff1fd5e6ca6d21.tar.bz2
A change made yesterday caused us not to include any of the toolkit_views rules
Review URL: http://codereview.chromium.org/115880 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17188 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/chrome.gyp11
1 files changed, 3 insertions, 8 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 957c79a..93af641 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1721,6 +1721,8 @@
['include', '^browser/dock_info_gtk.cc'],
['include', '^browser/dock_info.cc'],
['include', '^browser/dock_info.h'],
+ ['include', '^browser/encoding_menu_controller_delegate.cc'],
+ ['include', '^browser/encoding_menu_controller_delegate.h'],
['include', '^browser/views/bookmark_bar_view.cc'],
['include', '^browser/views/bookmark_bar_view.h'],
['include', '^browser/views/bookmark_context_menu.cc'],
@@ -1801,14 +1803,6 @@
],
}],
],
- 'conditions': [
- ['toolkit_views==0',{
- # Exclude files that only compile on views for non-Windows.
- 'sources/': [
- ['exclude', '^browser/encoding_menu_controller_delegate.cc'],
- ],
- }],
- ],
# Exclude files that should be excluded for all non-Windows platforms.
'sources!': [
'browser/autocomplete/autocomplete_accessibility.cc',
@@ -1822,6 +1816,7 @@
'browser/extensions/extension_shelf.cc',
'browser/dock_info.cc',
'browser/dom_ui/html_dialog_contents.cc',
+ 'browser/encoding_menu_controller_delegate.cc',
'browser/external_tab_container.cc',
'browser/google_update.cc',
'browser/history/history_indexer.idl',