Skip to content

GitLab

T
tangled
Commit 46709b27 authored by sadrul's avatar sadrul Committed by Commit bot
Browse files
Options

extensions: Check |enable_extensions| flag before depending on extension code. 

Avoid depending on (or including) extensions related code when enable_extensions
gyp/gn flag is not set. This fixes 'gn gen' for android with toolkit_views turned
on.

BUG=488576

Review URL: https://codereview.chromium.org/1160773004

Cr-Commit-Position: refs/heads/master@{#333690}
parent 0ef928ab
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 33 deletions
apps/BUILD.gn
View file @ 46709b27
...@@ -63,10 +63,12 @@ static_library("apps") { ...@@ -63,10 +63,12 @@ static_library("apps") {
"ui/views/app_window_frame_view.h", "ui/views/app_window_frame_view.h",
] ]
deps += [ deps += [
"//extensions/browser",
"//ui/strings", "//ui/strings",
"//ui/views", "//ui/views",
] ]
if (enable_extensions) {
deps += [ "//extensions/browser" ]
}
} }
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
......
apps/apps.gypi
View file @ 46709b27
...@@ -75,7 +75,6 @@ ...@@ -75,7 +75,6 @@
], ],
['toolkit_views==1', { ['toolkit_views==1', {
'dependencies': [ 'dependencies': [
'../extensions/extensions.gyp:extensions_browser',
'../ui/strings/ui_strings.gyp:ui_strings', '../ui/strings/ui_strings.gyp:ui_strings',
'../ui/views/views.gyp:views', '../ui/views/views.gyp:views',
], ],
...@@ -84,6 +83,11 @@ ...@@ -84,6 +83,11 @@
['exclude', 'ui/views/'], ['exclude', 'ui/views/'],
], ],
}], }],
['toolkit_views==1 and enable_extensions==1', {
'dependencies': [
'../extensions/extensions.gyp:extensions_browser',
],
}],
], ],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ], 'msvs_disabled_warnings': [ 4267, ],
......
chrome/browser/ui/BUILD.gn
View file @ 46709b27
...@@ -213,6 +213,13 @@ source_set("ui") { ...@@ -213,6 +213,13 @@ source_set("ui") {
rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
".", ".",
"//chrome") "//chrome")
if (enable_extensions) {
sources += rebase_path(
gypi_values.chrome_browser_ui_views_extensions_non_mac_sources,
".",
"//chrome")
deps += [ "//extensions/components/native_app_window" ]
}
if (is_chromeos) { if (is_chromeos) {
# TODO(GYP): crbug.com/481629. These files should probably not be # TODO(GYP): crbug.com/481629. These files should probably not be
# a part of ui_views_non_mac_sources at all. # a part of ui_views_non_mac_sources at all.
...@@ -313,6 +320,11 @@ source_set("ui") { ...@@ -313,6 +320,11 @@ source_set("ui") {
rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources, rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
".", ".",
"//chrome") "//chrome")
sources += rebase_path(
gypi_values.chrome_browser_ui_views_extensions_non_mac_sources,
".",
"//chrome")
deps += [ "//extensions/components/native_app_window" ]
} else { } else {
sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources, sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources,
".", ".",
......
chrome/chrome_browser_ui.gypi
View file @ 46709b27
...@@ -2118,37 +2118,6 @@ ...@@ -2118,37 +2118,6 @@
'browser/ui/views/exclusive_access_bubble_views.cc', 'browser/ui/views/exclusive_access_bubble_views.cc',
'browser/ui/views/exclusive_access_bubble_views.h', 'browser/ui/views/exclusive_access_bubble_views.h',
'browser/ui/views/exclusive_access_bubble_views_context.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.cc',
'browser/ui/views/find_bar_host.h', 'browser/ui/views/find_bar_host.h',
'browser/ui/views/find_bar_view.cc', 'browser/ui/views/find_bar_view.cc',
...@@ -2421,6 +2390,39 @@ ...@@ -2421,6 +2390,39 @@
'browser/ui/views/website_settings/website_settings_popup_view.cc', 'browser/ui/views/website_settings/website_settings_popup_view.cc',
'browser/ui/views/website_settings/website_settings_popup_view.h', '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. # 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 # TODO(jackhou): Move items to chrome_browser_ui_views_sources when they
# migrate from mac_views_browser to a chrome://flag. # migrate from mac_views_browser to a chrome://flag.
...@@ -2914,6 +2916,14 @@ ...@@ -2914,6 +2916,14 @@
}], }],
['OS!="mac"', { ['OS!="mac"', {
'sources': [ '<@(chrome_browser_ui_views_non_mac_sources)' ], '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',
],
}],
],
}], }],
], ],
}], }],
...@@ -2985,6 +2995,7 @@ ...@@ -2985,6 +2995,7 @@
'sources': [ 'sources': [
'<@(chrome_browser_ui_views_mac_experimental_sources)', '<@(chrome_browser_ui_views_mac_experimental_sources)',
'<@(chrome_browser_ui_views_non_mac_sources)', '<@(chrome_browser_ui_views_non_mac_sources)',
'<@(chrome_browser_ui_views_extensions_non_mac_sources)',
], ],
}, { }, {
'sources': [ '<@(chrome_browser_ui_cocoa_sources)' ], 'sources': [ '<@(chrome_browser_ui_cocoa_sources)' ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment