Chromium Code Reviews| Index: chrome/chrome.gyp |
| diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp |
| index 71486f69dc2a7359a9a85684356ae94a7aca5110..de37bdf63808b60c55cd787ebc762162bc22abeb 100755 |
| --- a/chrome/chrome.gyp |
| +++ b/chrome/chrome.gyp |
| @@ -538,8 +538,10 @@ |
| 'common/extensions/extension_error_reporter.h', |
| 'common/extensions/extension_error_utils.cc', |
| 'common/extensions/extension_error_utils.h', |
| - 'common/extensions/extension_action2.cc', |
| - 'common/extensions/extension_action2.h', |
| + 'common/extensions/extension_action.cc', |
| + 'common/extensions/extension_action.h', |
|
Nebojša Ćirić
2009/10/27 22:04:35
action2->action changes are result of a merge?
|
| + 'common/extensions/extension_l10n_util.cc', |
| + 'common/extensions/extension_l10n_util.h', |
| 'common/extensions/extension_message_bundle.cc', |
| 'common/extensions/extension_message_bundle.h', |
| 'common/extensions/extension_resource.cc', |
| @@ -1328,8 +1330,6 @@ |
| 'browser/extensions/extension_host.h', |
| 'browser/extensions/extension_install_ui.cc', |
| 'browser/extensions/extension_install_ui.h', |
| - 'browser/extensions/extension_l10n_util.cc', |
| - 'browser/extensions/extension_l10n_util.h', |
| 'browser/extensions/extension_message_service.cc', |
| 'browser/extensions/extension_message_service.h', |
| 'browser/extensions/extension_browser_event_router.cc', |
| @@ -4500,7 +4500,6 @@ |
| 'browser/download/save_package_unittest.cc', |
| 'browser/encoding_menu_controller_unittest.cc', |
| 'browser/extensions/extension_file_util_unittest.cc', |
| - 'browser/extensions/extension_l10n_util_unittest.cc', |
| 'browser/extensions/extension_messages_unittest.cc', |
| 'browser/extensions/extension_process_manager_unittest.cc', |
| 'browser/extensions/extension_ui_unittest.cc', |
| @@ -4626,7 +4625,8 @@ |
| 'common/common_param_traits_unittest.cc', |
| 'common/extensions/extension_resource_unittest.cc', |
| 'common/extensions/extension_unittest.cc', |
| - 'common/extensions/extension_action2_unittest.cc', |
| + 'common/extensions/extension_action_unittest.cc', |
| + 'common/extensions/extension_l10n_util_unittest.cc', |
| 'common/extensions/extension_message_bundle_unittest.cc', |
| 'common/extensions/update_manifest_unittest.cc', |
| 'common/extensions/url_pattern_unittest.cc', |