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

Unified Diff: chrome/browser/ui/BUILD.gn

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: 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 | « apps/apps.gypi ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 02e05b72887ef96b5c6b2cb66f6e8a77c5beb2af..86ad0e5716fbb14f354650d01ce8bca2cd626a4c 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -206,11 +206,21 @@ source_set("ui") {
"//chrome")
}
if (!is_mac) {
- sources +=
- rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
- ".",
- "//chrome")
- deps += [ "//extensions/components/native_app_window" ]
+ if (!enable_extensions) {
+ set_sources_assignment_filter(
+ sources_assignment_filter + [ "*/extensions/*" ])
brettw 2015/06/07 22:48:00 Our rule in the GN build is to only use the filter
sadrul 2015/06/09 21:08:35 Done.
+ sources +=
+ rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
+ ".",
+ "//chrome")
+ set_sources_assignment_filter(sources_assignment_filter)
+ } else {
+ sources +=
+ rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
+ ".",
+ "//chrome")
+ deps += [ "//extensions/components/native_app_window" ]
+ }
if (is_chromeos) {
# TODO(GYP): crbug.com/481629. These files should probably not be
# a part of ui_views_non_mac_sources at all.
« no previous file with comments | « apps/apps.gypi ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698