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

Unified Diff: chrome/chrome_browser.gypi

Issue 1741010: gyp: unify toolkit_views usage (Closed)
Patch Set: Created 10 years, 8 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
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index d56218f3ce43cbd318f5416c7a3599f850eb4643..dbd4fbcb1c65b047fb510ac4577dcc218a229de8 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2785,7 +2785,7 @@
['exclude', '^browser/views/'],
],
'conditions': [
- ['OS=="linux" and (toolkit_views==1 or chromeos==1)',{
+ ['OS=="linux" and toolkit_views==1',{
'dependencies': [
'../views/views.gyp:views',
],
@@ -3077,7 +3077,7 @@
# 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', {
+ ['OS=="linux" and toolkit_views==1 and chromeos==0', {
'sources/': [
['include', '^browser/gtk/dialogs_gtk.cc'],
['include', '^browser/gtk/external_protocol_dialog_gtk.cc'],
@@ -3089,7 +3089,7 @@
],
}],
# GTK build only
- ['OS=="linux" and chromeos==0 and toolkit_views==0', {
+ ['OS=="linux" and toolkit_views==0', {
'sources/': [
['include', '^browser/printing/print_dialog_gtk.cc'],
['include', '^browser/printing/print_dialog_gtk.h'],
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | chrome/chrome_exe.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698