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

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: 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 | « 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 387e004a1daf20b3cb99479053806545a7de3f57..0353a12d7441d78d6be486cf674dfe70f8f8bc98 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -213,6 +213,13 @@ source_set("ui") {
rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
".",
"//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) {
# TODO(GYP): crbug.com/481629. These files should probably not be
# a part of ui_views_non_mac_sources at all.
@@ -313,6 +320,11 @@ source_set("ui") {
rebase_path(gypi_values.chrome_browser_ui_views_non_mac_sources,
".",
"//chrome")
+ sources += rebase_path(
+ gypi_values.chrome_browser_ui_views_extensions_non_mac_sources,
+ ".",
+ "//chrome")
+ deps += [ "//extensions/components/native_app_window" ]
} else {
sources += rebase_path(gypi_values.chrome_browser_ui_cocoa_sources,
".",
« 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