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

Unified Diff: chrome/browser/ui/libgtk2ui/libgtk2ui.gyp

Issue 1293073006: Make gtk2/gtk3 compile time switchable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove deprecation warning. Created 5 years, 4 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 | « chrome/browser/ui/libgtk2ui/BUILD.gn ('k') | gpu/gles2_conform_support/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
diff --git a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
index d3e3004bed890e3218d2f4b087448ab17fdbbbbc..2d219fd1647cd7f0164cdb5bf2590f9be453a739 100644
--- a/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
+++ b/chrome/browser/ui/libgtk2ui/libgtk2ui.gyp
@@ -16,8 +16,6 @@
'../../../../base/base.gyp:base_i18n',
'../../../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../../../../build/linux/system.gyp:gconf',
- '../../../../build/linux/system.gyp:gtk',
- '../../../../build/linux/system.gyp:gtkprint',
'../../../../build/linux/system.gyp:x11',
'../../../../components/components_resources.gyp:components_resources',
'../../../../content/content.gyp:content',
@@ -106,6 +104,17 @@
'gconf_listener.h',
],
}],
+ ['use_gtk3==1', {
+ 'dependencies': [
+ '../../../../build/linux/system.gyp:gtk3',
+ '../../../../build/linux/system.gyp:gtkprint3',
+ ],
+ }, {
+ 'dependencies': [
+ '../../../../build/linux/system.gyp:gtk2',
+ '../../../../build/linux/system.gyp:gtkprint2',
+ ],
+ }],
[ 'clang==1', {
'cflags': [
# G_DEFINE_TYPE automatically generates a *get_instance_private inline function after glib 2.37.
« no previous file with comments | « chrome/browser/ui/libgtk2ui/BUILD.gn ('k') | gpu/gles2_conform_support/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698