diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 22:58:17 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-26 22:58:17 +0000 |
| commit | b3f23ba24e4dbf61099e522612a7ce9e49987911 (patch) | |
| tree | e7e1df6b02aaeda017ea9930d1790518ee3d3166 /chrome | |
| parent | fda5dffa8a730e506add93fc9dcf8c95c98a8b1d (diff) | |
| download | chromium_src-b3f23ba24e4dbf61099e522612a7ce9e49987911.zip chromium_src-b3f23ba24e4dbf61099e522612a7ce9e49987911.tar.gz chromium_src-b3f23ba24e4dbf61099e522612a7ce9e49987911.tar.bz2 | |
Fix the toolkit_views gyp variable define mania.
This makes it so toolkit_views==1 is always true for views builds,
either on Windows or ChromeOS.
Three levels of nesting are needed for this chained conditional:
1) Set the default value of ChromeOS.
2) Depending on ChromeOS value, set the default value of toolkit_views.
3) Depending on toolkit_views value, set the rest of the build variables.
This should have no affect on the build, but will allow subsequent cleanup.
Review URL: http://codereview.chromium.org/1799002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45639 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome_browser.gypi | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 3997320..d56218f 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3074,7 +3074,10 @@ ['exclude', '^browser/browser_list_gtk.cc'], ], }], - ['OS=="linux" and toolkit_views==1', { + # These GTK files haven't been ported to views, while ChromeOS has + # its own separate implementation below. So re-include them only on + # non-ChromeOS views Linux builds. + ['OS=="linux" and chromeos==0 and toolkit_views==1', { 'sources/': [ ['include', '^browser/gtk/dialogs_gtk.cc'], ['include', '^browser/gtk/external_protocol_dialog_gtk.cc'], |