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

Unified Diff: chrome_frame/chrome_frame.gyp

Issue 7766007: Only put the chrome frame resources in the locale dlls. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove include 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/app/generated_resources.grd ('k') | chrome_frame/find_dialog.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame.gyp
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 63862cd0bfc3903b2a31deaf4fb5a990bab18c5f..c772913ce67218e79706dbb9b61f44299af6cb2f 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -31,8 +31,6 @@
},
'target_defaults': {
'dependencies': [
- # locales need to be built for the chrome frame binaries to be loadable.
- 'locales/locales.gyp:*',
'../chrome/chrome.gyp:chrome_resources',
'../chrome/chrome.gyp:chrome_strings',
'../chrome/chrome.gyp:packed_resources',
@@ -85,6 +83,7 @@
'chrome_frame_ie',
'chrome_frame_strings',
'chrome_tab_idl',
+ 'locales/locales.gyp:*',
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
@@ -205,6 +204,7 @@
'chrome_frame_strings',
'chrome_frame_utils',
'chrome_tab_idl',
+ 'locales/locales.gyp:*',
'npchrome_frame',
],
'sources': [
@@ -311,6 +311,7 @@
'chrome_frame_strings',
'chrome_frame_utils',
'chrome_tab_idl',
+ 'locales/locales.gyp:*',
'npchrome_frame',
],
'sources': [
@@ -464,6 +465,7 @@
'chrome_frame_ie',
'chrome_frame_strings',
'chrome_tab_idl',
+ 'locales/locales.gyp:*',
],
'sources': [
'test/reliability/run_all_unittests.cc',
@@ -532,6 +534,7 @@
'../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
'chrome_frame_ie',
'chrome_frame_strings',
+ 'locales/locales.gyp:*',
'npchrome_frame',
],
'sources': [
@@ -600,6 +603,13 @@
},
'includes': [ '../build/grit_action.gypi' ],
},
+ {
+ 'action_name': 'chrome_frame_dialogs',
+ 'variables': {
+ 'grit_grd_file': 'resources/chrome_frame_dialogs.grd',
+ },
+ 'includes': [ '../build/grit_action.gypi' ],
+ },
],
'includes': [ '../build/grit_target.gypi' ],
},
@@ -631,6 +641,7 @@
'chrome_frame_strings',
'chrome_frame_utils',
'chrome_tab_idl',
+ 'locales/locales.gyp:*',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/app/policy/cloud_policy_codegen.gyp:policy',
'../chrome/chrome.gyp:common',
@@ -829,9 +840,10 @@
'chrome_frame_utils',
'chrome_tab_idl',
'chrome_frame_launcher.gyp:chrome_launcher',
- '../build/temp_gyp/googleurl.gyp:googleurl',
'chrome_frame_launcher.gyp:chrome_frame_helper',
'chrome_frame_launcher.gyp:chrome_frame_helper_dll',
+ 'locales/locales.gyp:*',
+ '../build/temp_gyp/googleurl.gyp:googleurl',
'../chrome/chrome.gyp:chrome',
'../chrome/chrome.gyp:chrome_dll',
'../chrome/chrome.gyp:chrome_version_resources',
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome_frame/find_dialog.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698