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

Unified Diff: chrome/chrome_browser.gypi

Issue 7584004: Keeping the current directory in URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Conflicts resolved. Created 9 years, 4 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/browser.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0a22eeb876070c2ef89c29bc6c614f2f36e73ba9..fafb1a2cacd8bab20e8da51ce63d5e8b3260bd20 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3788,15 +3788,9 @@
['exclude', '^browser/extensions/extension_input_ui_api.h'],
['exclude', '^browser/ui/webui/chromeos'],
['exclude', '^browser/ui/webui/options/chromeos'],
- ['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
- ['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
['exclude', 'browser/extensions/extension_input_method_api.cc'],
['exclude', 'browser/extensions/extension_input_method_api.h'],
- ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc'],
- ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h'],
['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
- ['exclude', 'browser/extensions/file_manager_util.h'],
- ['exclude', 'browser/extensions/file_manager_util.cc'],
['exclude', 'browser/oom_priority_manager.cc'],
['exclude', 'browser/oom_priority_manager.h'],
['exclude', 'browser/policy/device_policy_cache.cc'],
@@ -3840,6 +3834,16 @@
'browser/upgrade_detector_impl.h',
],
}],
+ ['file_manager_extension==0', {
+ 'sources/': [
+ ['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h'],
+ ['exclude', 'browser/extensions/file_manager_util.h'],
+ ['exclude', 'browser/extensions/file_manager_util.cc'],
+ ],
+ }],
['use_ibus==1', {
'dependencies': [
'../build/linux/system.gyp:ibus',
@@ -4600,13 +4604,25 @@
],
}],
# Exclude extension_input_ui_api again
- # (Required because of the '^browser/extensions/' include abrove)
+ # (Required because of the '^browser/extensions/' include above)
['toolkit_uses_gtk == 1 and ( touchui == 0 or chromeos == 0 )', {
'sources/': [
['exclude', '^browser/extensions/extension_input_ui_api.cc'],
['exclude', '^browser/extensions/extension_input_ui_api.h'],
],
}],
+ # Exclude file manager files again
+ # (Required because of the '^browser/extensions/' include above)
+ ['file_manager_extension==0', {
+ 'sources/': [
+ ['exclude', 'browser/extensions/extension_file_browser_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_file_browser_private_api.h'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc'],
+ ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h'],
+ ['exclude', 'browser/extensions/file_manager_util.h'],
+ ['exclude', 'browser/extensions/file_manager_util.cc'],
+ ],
+ }],
# GTK build only
['toolkit_uses_gtk == 1 and toolkit_views == 0', {
'sources/': [
« no previous file with comments | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698