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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/common.gypi

Issue 7996008: Get views and views_unittests to build w/ use_aura=1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed some chrome changes Created 9 years, 3 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
« no previous file with comments | « build/build_config.h ('k') | views/accelerator.cc » ('j') | views/mouse_watcher.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 79a1880f228e4d3a2058c6f6c883d570bb6646d4..df2584866a954a48490069a6c34fc4f98a541a10 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -237,7 +237,7 @@
'use_x11%': 1,
}],
['use_aura==1 and OS!="win"', {
- 'toolkit_uses_gtk%': 1,
+ 'toolkit_uses_gtk%': 0,
}],
# A flag to enable or disable our compile-time dependency
@@ -856,6 +856,9 @@
['use_aura==1', {
'defines': ['USE_AURA=1'],
}],
+ ['toolkit_uses_gtk==1', {
+ 'defines': ['TOOLKIT_USES_GTK=1'],
sadrul 2011/09/22 17:44:31 Nice
+ }],
['chromeos==1', {
'defines': ['OS_CHROMEOS=1'],
}],
« no previous file with comments | « build/build_config.h ('k') | views/accelerator.cc » ('j') | views/mouse_watcher.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698