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

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: Reviewer cleanup. 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 3925 matching lines...) Expand 10 before | Expand all | Expand 10 after
3936 ], 3936 ],
3937 'include_dirs': [ 3937 'include_dirs': [
3938 '../third_party/angle/include', 3938 '../third_party/angle/include',
3939 ], 3939 ],
3940 'link_settings': { 3940 'link_settings': {
3941 'libraries': [ 3941 'libraries': [
3942 '-lXcomposite', 3942 '-lXcomposite',
3943 ], 3943 ],
3944 }, 3944 },
3945 }], 3945 }],
3946 ['webui_certificate_viewer==0', { 3946 ['webui_dialogs == 1', {
3947 'defines': [
3948 'WEBUI_DIALOGS',
3949 ],
3950 }],
3951 # Exclude WebUI certificate viewer if not POSIX, mac (these OS's have
3952 # native certificate viewers) or WebUI dialogs are disabled.
3953 ['webui_dialogs == 0 or os_posix == 0 or OS == "mac"', {
3947 'sources/': [ 3954 'sources/': [
3948 ['exclude', '^browser/ui/webui/certificate_viewer.cc'], 3955 ['exclude', '^browser/ui/webui/certificate_viewer.cc'],
3949 ['exclude', '^browser/ui/webui/certificate_viewer.h'], 3956 ['exclude', '^browser/ui/webui/certificate_viewer.h'],
3950 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'], 3957 ['exclude', '^browser/ui/webui/certificate_viewer_ui.cc'],
3951 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'], 3958 ['exclude', '^browser/ui/webui/certificate_viewer_ui.h'],
3952 ], 3959 ],
3953 }], 3960 }],
3954 ['webui_certificate_viewer==1', { 3961 ['webui_dialogs == 1', {
3955 'sources/': [ 3962 'sources/': [
3956 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'], 3963 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
3957 ['exclude', '^browser/ui/gtk/certificate_viewer.h'], 3964 ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
3958 ], 3965 ],
3959 'defines': [
3960 'WEBUI_CERTIFICATE_VIEWER',
3961 ],
3962 }], 3966 }],
3963 ['toolkit_uses_gtk == 1', { 3967 ['toolkit_uses_gtk == 1', {
3964 'dependencies': [ 3968 'dependencies': [
3965 '../build/linux/system.gyp:dbus-glib', 3969 '../build/linux/system.gyp:dbus-glib',
3966 '../build/linux/system.gyp:gconf', 3970 '../build/linux/system.gyp:gconf',
3967 '../build/linux/system.gyp:gtk', 3971 '../build/linux/system.gyp:gtk',
3968 '../build/linux/system.gyp:gtkprint', 3972 '../build/linux/system.gyp:gtkprint',
3969 '../build/linux/system.gyp:ssl', 3973 '../build/linux/system.gyp:ssl',
3970 '../build/linux/system.gyp:x11', 3974 '../build/linux/system.gyp:x11',
3971 '../third_party/undoview/undoview.gyp:undoview', 3975 '../third_party/undoview/undoview.gyp:undoview',
(...skipping 624 matching lines...) Expand 10 before | Expand all | Expand 10 after
4596 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'], 4600 ['exclude', '^browser/tab_contents/render_view_context_menu_gtk. h'],
4597 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'], 4601 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.cc'],
4598 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'], 4602 ['exclude', '^browser/tab_contents/tab_contents_view_gtk.h'],
4599 ['exclude', '^browser/ui/browser_list_gtk.cc'], 4603 ['exclude', '^browser/ui/browser_list_gtk.cc'],
4600 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'] , 4604 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.cc'] ,
4601 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'], 4605 ['exclude', '^browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h'],
4602 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'], 4606 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.cc'],
4603 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'], 4607 ['exclude', '^browser/ui/panels/panel_browser_window_gtk.h'],
4604 ], 4608 ],
4605 }], 4609 }],
4606 # Exclude the GTK cert viewer again if webui_certificate_viewer is 4610 # Exclude the GTK cert viewer again if webui_dialogs are
4607 # enabled. 4611 # enabled.
4608 ['webui_certificate_viewer==1', { 4612 ['webui_dialogs==1', {
4609 'sources/': [ 4613 'sources/': [
4610 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'], 4614 ['exclude', '^browser/ui/gtk/certificate_viewer.cc'],
4611 ['exclude', '^browser/ui/gtk/certificate_viewer.h'], 4615 ['exclude', '^browser/ui/gtk/certificate_viewer.h'],
4612 ], 4616 ],
4613 }], 4617 }],
4614 # Exclude these toolkit_views specific files again. 4618 # Exclude these toolkit_views specific files again.
4615 # (Required because of the '^browser/extensions/' include above) 4619 # (Required because of the '^browser/extensions/' include above)
4616 ['toolkit_views==0', { 4620 ['toolkit_views==0', {
4617 'sources/': [ 4621 'sources/': [
4618 ['exclude', '^browser/extensions/extension_input_api.cc'], 4622 ['exclude', '^browser/extensions/extension_input_api.cc'],
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
5026 # weak imports in dependents, who still must #include 5030 # weak imports in dependents, who still must #include
5027 # closure_blocks_leopard_compat.h to get weak imports. 5031 # closure_blocks_leopard_compat.h to get weak imports.
5028 'type': 'none', 5032 'type': 'none',
5029 }], 5033 }],
5030 ], 5034 ],
5031 }, 5035 },
5032 ], 5036 ],
5033 }], 5037 }],
5034 ], 5038 ],
5035 } 5039 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698