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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 1160773004: extensions: Check |enable_extensions| flag before depending on extension code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge Created 5 years, 6 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/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 3b6023b0087016d9e1b26c7aabf0e08868b177af..c4bf5acb3bf946830acc334a7593e51c8c2b28d9 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2119,37 +2119,6 @@
'browser/ui/views/exclusive_access_bubble_views.cc',
'browser/ui/views/exclusive_access_bubble_views.h',
'browser/ui/views/exclusive_access_bubble_views_context.h',
- 'browser/ui/views/extensions/bookmark_app_bubble_view.cc',
- 'browser/ui/views/extensions/bookmark_app_bubble_view.h',
- 'browser/ui/views/extensions/browser_action_drag_data.cc',
- 'browser/ui/views/extensions/browser_action_drag_data.h',
- 'browser/ui/views/extensions/bundle_installed_bubble.cc',
- 'browser/ui/views/extensions/device_permissions_dialog_view.cc',
- 'browser/ui/views/extensions/device_permissions_dialog_view.h',
- 'browser/ui/views/extensions/extension_action_platform_delegate_views.cc',
- 'browser/ui/views/extensions/extension_action_platform_delegate_views.h',
- 'browser/ui/views/extensions/extension_dialog.cc',
- 'browser/ui/views/extensions/extension_dialog.h',
- 'browser/ui/views/extensions/extension_dialog_observer.cc',
- 'browser/ui/views/extensions/extension_dialog_observer.h',
- 'browser/ui/views/extensions/extension_install_dialog_view.cc',
- 'browser/ui/views/extensions/extension_installed_bubble_view.cc',
- 'browser/ui/views/extensions/extension_installed_bubble_view.h',
- 'browser/ui/views/extensions/extension_message_bubble_view.cc',
- 'browser/ui/views/extensions/extension_message_bubble_view.h',
- 'browser/ui/views/extensions/extension_popup.cc',
- 'browser/ui/views/extensions/extension_popup.h',
- 'browser/ui/views/extensions/extension_popup_aura.cc',
- 'browser/ui/views/extensions/extension_popup_aura.h',
- 'browser/ui/views/extensions/extension_toolbar_icon_surfacing_bubble_views.cc',
- 'browser/ui/views/extensions/extension_toolbar_icon_surfacing_bubble_views.h',
- 'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
- 'browser/ui/views/extensions/extension_view_views.cc',
- 'browser/ui/views/extensions/extension_view_views.h',
- 'browser/ui/views/extensions/media_galleries_dialog_views.cc',
- 'browser/ui/views/extensions/media_galleries_dialog_views.h',
- 'browser/ui/views/extensions/media_gallery_checkbox_view.cc',
- 'browser/ui/views/extensions/media_gallery_checkbox_view.h',
'browser/ui/views/find_bar_host.cc',
'browser/ui/views/find_bar_host.h',
'browser/ui/views/find_bar_view.cc',
@@ -2422,6 +2391,39 @@
'browser/ui/views/website_settings/website_settings_popup_view.cc',
'browser/ui/views/website_settings/website_settings_popup_view.h',
],
+ 'chrome_browser_ui_views_extensions_non_mac_sources': [
+ 'browser/ui/views/extensions/bookmark_app_bubble_view.cc',
+ 'browser/ui/views/extensions/bookmark_app_bubble_view.h',
+ 'browser/ui/views/extensions/browser_action_drag_data.cc',
+ 'browser/ui/views/extensions/browser_action_drag_data.h',
+ 'browser/ui/views/extensions/bundle_installed_bubble.cc',
+ 'browser/ui/views/extensions/device_permissions_dialog_view.cc',
+ 'browser/ui/views/extensions/device_permissions_dialog_view.h',
+ 'browser/ui/views/extensions/extension_action_platform_delegate_views.cc',
+ 'browser/ui/views/extensions/extension_action_platform_delegate_views.h',
+ 'browser/ui/views/extensions/extension_dialog.cc',
+ 'browser/ui/views/extensions/extension_dialog.h',
+ 'browser/ui/views/extensions/extension_dialog_observer.cc',
+ 'browser/ui/views/extensions/extension_dialog_observer.h',
+ 'browser/ui/views/extensions/extension_install_dialog_view.cc',
+ 'browser/ui/views/extensions/extension_installed_bubble_view.cc',
+ 'browser/ui/views/extensions/extension_installed_bubble_view.h',
+ 'browser/ui/views/extensions/extension_message_bubble_view.cc',
+ 'browser/ui/views/extensions/extension_message_bubble_view.h',
+ 'browser/ui/views/extensions/extension_popup.cc',
+ 'browser/ui/views/extensions/extension_popup.h',
+ 'browser/ui/views/extensions/extension_popup_aura.cc',
+ 'browser/ui/views/extensions/extension_popup_aura.h',
+ 'browser/ui/views/extensions/extension_toolbar_icon_surfacing_bubble_views.cc',
+ 'browser/ui/views/extensions/extension_toolbar_icon_surfacing_bubble_views.h',
+ 'browser/ui/views/extensions/extension_uninstall_dialog_view.cc',
+ 'browser/ui/views/extensions/extension_view_views.cc',
+ 'browser/ui/views/extensions/extension_view_views.h',
+ 'browser/ui/views/extensions/media_galleries_dialog_views.cc',
+ 'browser/ui/views/extensions/media_galleries_dialog_views.h',
+ 'browser/ui/views/extensions/media_gallery_checkbox_view.cc',
+ 'browser/ui/views/extensions/media_gallery_checkbox_view.h',
+ ],
# MacViews sources that we still want to keep behind a compile-time flag.
# TODO(jackhou): Move items to chrome_browser_ui_views_sources when they
# migrate from mac_views_browser to a chrome://flag.
@@ -2915,6 +2917,14 @@
}],
['OS!="mac"', {
'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ],
+ 'conditions': [
+ ['enable_extensions==1', {
+ 'sources': [ '<@(chrome_browser_ui_views_extensions_non_mac_sources)' ],
+ 'dependencies': [
+ '<(DEPTH)/extensions/components/extensions_components.gyp:native_app_window',
+ ],
+ }],
+ ],
}],
],
}],
@@ -2986,6 +2996,7 @@
'sources': [
'<@(chrome_browser_ui_views_mac_experimental_sources)',
'<@(chrome_browser_ui_views_non_mac_sources)',
+ '<@(chrome_browser_ui_views_extensions_non_mac_sources)',
],
}, {
'sources': [ '<@(chrome_browser_ui_cocoa_sources)' ],
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698