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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 7572022: Use bookmark manager to add/edit bookmark pages with webui_dialogs=1. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Abstract common methods, use single flag for all WebUI dialogs. Created 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 3899 matching lines...) Expand 10 before | Expand all | Expand 10 after
3910 ], 3910 ],
3911 'include_dirs': [ 3911 'include_dirs': [
3912 '../third_party/angle/include', 3912 '../third_party/angle/include',
3913 ], 3913 ],
3914 'link_settings': { 3914 'link_settings': {
3915 'libraries': [ 3915 'libraries': [
3916 '-lXcomposite', 3916 '-lXcomposite',
3917 ], 3917 ],
3918 }, 3918 },
3919 }], 3919 }],
3920 ['webui_certificate_viewer==0', { 3920 ['webui_dialogs == 1', {
3921 'defines': [
3922 'WEBUI_DIALOGS',
3923 ],
3924 }],
3925 # Exclude WebUI certificate viewer if not POSIX, mac (these OS's have
3926 # native certificate viewers) or WebUI dialogs are disabled.
3927 ['webui_dialogs == 0 or os_posix == 0 or OS == "mac"', {
3921 'sources/': [ 3928 'sources/': [
3922 ['exclude', '^browser/ui/webui/certificate_viewer.cc'], 3929 ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
3923 ['exclude', '^browser/ui/webui/certificate_viewer.h'], 3930 ['exclude', '^browser/ui/webui/certificate_viewer.h'],
3924 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'], 3931 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
3925 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'], 3932 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
3926 ], 3933 ],
3927 }], 3934 }],
3928 ['webui_certificate_viewer==1', { 3935 ['webui_dialogs == 1', {
3929 'sources/': [ 3936 'sources/': [
3930 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'], 3937 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
3931 ['exclude', '^browser/ui/gtk/certificate_viewer.h'], 3938 ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
3932 ], 3939 ],
3933 'defines': [
3934 'WEBUI_CERTIFICATE_VIEWER',
3935 ],
3936 }], 3940 }],
3937 ['toolkit_uses_gtk == 1', { 3941 ['toolkit_uses_gtk == 1', {
3938 'dependencies': [ 3942 'dependencies': [
3939 '../build/linux/system.gyp:dbus-glib', 3943 '../build/linux/system.gyp:dbus-glib',
3940 '../build/linux/system.gyp:gconf', 3944 '../build/linux/system.gyp:gconf',
3941 '../build/linux/system.gyp:gtk', 3945 '../build/linux/system.gyp:gtk',
3942 '../build/linux/system.gyp:gtkprint', 3946 '../build/linux/system.gyp:gtkprint',
3943 '../build/linux/system.gyp:ssl', 3947 '../build/linux/system.gyp:ssl',
3944 '../build/linux/system.gyp:x11', 3948 '../build/linux/system.gyp:x11',
3945 '../third_party/undoview/undoview.gyp:undoview', 3949 '../third_party/undoview/undoview.gyp:undoview',
(...skipping 621 matching lines...) Expand 10 before | Expand all | Expand 10 after
4567 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'], 4571 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'],
4568 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'], 4572 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
4569 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'], 4573 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
4570 ['exclude', '^browser/ui/browser_list_gtk.cc'], 4574 ['exclude', '^browser/ui/browser_list_gtk.cc'],
4571 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'] , 4575 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'] ,
4572 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'], 4576 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'],
4573 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'], 4577 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'],
4574 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'], 4578 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'],
4575 ], 4579 ],
4576 }], 4580 }],
4577 # Exclude the GTK cert viewer again if webui_certificate_viewer is 4581 # Exclude the GTK cert viewer again if webui_dialogs are
4578 # enabled. 4582 # enabled.
4579 ['webui_certificate_viewer==1', { 4583 ['webui_dialogs==1', {
4580 'sources/': [ 4584 'sources/': [
4581 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'], 4585 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
4582 ['exclude', '^browser/ui/gtk/certificate_viewer.h'], 4586 ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
4583 ], 4587 ],
4584 }], 4588 }],
4585 # Exclude these toolkit_views specific files again. 4589 # Exclude these toolkit_views specific files again.
4586 # (Required because of the '^browser/extensions/' include above) 4590 # (Required because of the '^browser/extensions/' include above)
4587 ['toolkit_views==0', { 4591 ['toolkit_views==0', {
4588 'sources/': [ 4592 'sources/': [
4589 ['exclude', '^browser/extensions/extension_input_api.cc'], 4593 ['exclude', '^browser/extensions/extension_input_api.cc'],
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
4985 # weak imports in dependents, who still must #include 4989 # weak imports in dependents, who still must #include
4986 # closure_blocks_leopard_compat.h to get weak imports. 4990 # closure_blocks_leopard_compat.h to get weak imports.
4987 'type': 'none', 4991 'type': 'none',
4988 }], 4992 }],
4989 ], 4993 ],
4990 }, 4994 },
4991 ], 4995 ],
4992 }], 4996 }],
4993 ], 4997 ],
4994 } 4998 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698