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

Unified Diff: chrome/chrome_browser_ui.gypi

Issue 494993005: Only build various flash/pnacl/ppapi code when they are enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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/chrome_browser.gypi ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 4c6f734c52d1657d81482a111d2e8e01deb2b256..f53b5488597d1308f7c969cf51af0f4cdaac6d85 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1059,8 +1059,6 @@
'browser/ui/webui/fileicon_source.h',
'browser/ui/webui/flags_ui.cc',
'browser/ui/webui/flags_ui.h',
- 'browser/ui/webui/flash_ui.cc',
- 'browser/ui/webui/flash_ui.h',
'browser/ui/webui/gcm_internals_ui.cc',
'browser/ui/webui/gcm_internals_ui.h',
'browser/ui/webui/history_ui.cc',
@@ -1854,6 +1852,8 @@
'chrome_browser_ui_plugin_sources': [
'browser/ui/hung_plugin_tab_helper.cc',
'browser/ui/hung_plugin_tab_helper.h',
+ 'browser/ui/webui/flash_ui.cc',
+ 'browser/ui/webui/flash_ui.h',
],
'chrome_browser_ui_policy_sources': [
'browser/ui/webui/policy_ui.cc',
@@ -2621,7 +2621,6 @@
'../media/media.gyp:media',
'../mojo/mojo_base.gyp:mojo_system_impl',
'../net/net.gyp:net_with_v8',
- '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
'../third_party/expat/expat.gyp:expat',
'../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
'../third_party/libjingle/libjingle.gyp:libjingle',
@@ -2680,6 +2679,7 @@
'sources': [ '<@(chrome_browser_ui_plugin_sources)' ],
'dependencies': [
'../ppapi/ppapi_internal.gyp:ppapi_ipc',
+ '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
],
}],
['safe_browsing==1', {
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698