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

Side by Side Diff: chrome/chrome_browser_ui.gypi

Issue 148643002: Hide X11 dependencies when use_x11=0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review Fix: remove blank lines Created 6 years, 10 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_browser_extensions.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser_ui', 8 'target_name': 'browser_ui',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
(...skipping 3308 matching lines...) Expand 10 before | Expand all | Expand 10 after
3319 ] 3319 ]
3320 }], 3320 }],
3321 ], 3321 ],
3322 }], 3322 }],
3323 ['OS=="linux"', { 3323 ['OS=="linux"', {
3324 'conditions': [ 3324 'conditions': [
3325 ['use_aura==1', { 3325 ['use_aura==1', {
3326 'dependencies': [ 3326 'dependencies': [
3327 '../build/linux/system.gyp:dbus', 3327 '../build/linux/system.gyp:dbus',
3328 '../build/linux/system.gyp:fontconfig', 3328 '../build/linux/system.gyp:fontconfig',
3329 '../build/linux/system.gyp:x11',
3330 '../dbus/dbus.gyp:dbus', 3329 '../dbus/dbus.gyp:dbus',
3331 ], 3330 ],
3332 }], 3331 }],
3333 # GTK build only 3332 # GTK build only
3334 ['toolkit_uses_gtk==1', { 3333 ['toolkit_uses_gtk==1', {
3335 'sources/': [ 3334 'sources/': [
3336 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'], 3335 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'],
3337 ['exclude', '^browser/ui/views/notifications/balloon_collection_ views.cc'], 3336 ['exclude', '^browser/ui/views/notifications/balloon_collection_ views.cc'],
3338 ], 3337 ],
3339 }], 3338 }],
3339 # x11 build
3340 ['use_x11==1', {
3341 'dependencies': [
3342 '../build/linux/system.gyp:x11',
3343 ],
3344 }],
3340 ], 3345 ],
3341 }], 3346 }],
3342 # On chromeos, file manager extension handles the file open/save dialog. 3347 # On chromeos, file manager extension handles the file open/save dialog.
3343 ['chromeos==1', { 3348 ['chromeos==1', {
3344 'sources/': [ 3349 'sources/': [
3345 ['include', '^browser/ui/views/select_file_dialog_extension.cc'], 3350 ['include', '^browser/ui/views/select_file_dialog_extension.cc'],
3346 ['include', '^browser/ui/views/select_file_dialog_extension.h'], 3351 ['include', '^browser/ui/views/select_file_dialog_extension.h'],
3347 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'], 3352 ['include', '^browser/ui/views/select_file_dialog_extension_factory. cc'],
3348 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'], 3353 ['include', '^browser/ui/views/select_file_dialog_extension_factory. h'],
3349 ]}, { 3354 ]}, {
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
3412 'browser/ui/webui/local_discovery/local_discovery_ui.cc', 3417 'browser/ui/webui/local_discovery/local_discovery_ui.cc',
3413 'browser/ui/webui/local_discovery/local_discovery_ui.h', 3418 'browser/ui/webui/local_discovery/local_discovery_ui.h',
3414 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc', 3419 'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
3415 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h', 3420 'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
3416 ], 3421 ],
3417 }], 3422 }],
3418 ], 3423 ],
3419 }, 3424 },
3420 ], 3425 ],
3421 } 3426 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_extensions.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698