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

Unified Diff: apps/apps.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: 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
Index: apps/apps.gypi
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 7badfe3429e5e4ebfae7d291241ca8672fc4c59b..130cb8cda205bea5a44edbf606f810ce95f2e01e 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -75,7 +75,6 @@
],
['toolkit_views==1', {
'dependencies': [
- '../extensions/extensions.gyp:extensions_browser',
'../ui/strings/ui_strings.gyp:ui_strings',
'../ui/views/views.gyp:views',
],
@@ -84,6 +83,11 @@
['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.
'msvs_disabled_warnings': [ 4267, ],
« no previous file with comments | « apps/BUILD.gn ('k') | chrome/browser/ui/BUILD.gn » ('j') | chrome/browser/ui/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698