diff options
author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 23:52:54 +0000 |
---|---|---|
committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-08 23:52:54 +0000 |
commit | 1a3aba8d61535c28362e8408b102808302affe7c (patch) | |
tree | 37accfb740ee8b6acc60cfd2b029d6fcfd4623b7 /chrome/browser/cocoa | |
parent | f7fec7d508a0cc3fe51bf5906f3a6b42ac012b59 (diff) | |
download | chromium_src-1a3aba8d61535c28362e8408b102808302affe7c.zip chromium_src-1a3aba8d61535c28362e8408b102808302affe7c.tar.gz chromium_src-1a3aba8d61535c28362e8408b102808302affe7c.tar.bz2 |
Split out command IDs from chrome_dll_resource.h.
The name of this file is a leftover from Windows. Split the command
ids (which are used on all platforms) out, leaving just the
Windows-specific resource IDs in the original file.
TEST=compiles
Review URL: http://codereview.chromium.org/4710001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
31 files changed, 31 insertions, 31 deletions
diff --git a/chrome/browser/cocoa/accelerators_cocoa.h b/chrome/browser/cocoa/accelerators_cocoa.h index b8eaac8..e43c550 100644 --- a/chrome/browser/cocoa/accelerators_cocoa.h +++ b/chrome/browser/cocoa/accelerators_cocoa.h @@ -11,7 +11,7 @@ #include "app/menus/accelerator_cocoa.h" // This class maintains a map of command_ids to AcceleratorCocoa objects (see -// chrome/app/chrome_dll_resource.h). Currently, this only lists the commands +// chrome/app/chrome_command_ids.h). Currently, this only lists the commands // that are used in the Wrench menu. // // It is recommended that this class be used as a singleton so that the key map diff --git a/chrome/browser/cocoa/accelerators_cocoa.mm b/chrome/browser/cocoa/accelerators_cocoa.mm index 86b4bd5..4b1eb5d 100644 --- a/chrome/browser/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/cocoa/accelerators_cocoa.mm @@ -6,7 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" namespace { diff --git a/chrome/browser/cocoa/accelerators_cocoa_unittest.mm b/chrome/browser/cocoa/accelerators_cocoa_unittest.mm index b829351..3f0e307 100644 --- a/chrome/browser/cocoa/accelerators_cocoa_unittest.mm +++ b/chrome/browser/cocoa/accelerators_cocoa_unittest.mm @@ -6,7 +6,7 @@ #include "app/menus/accelerator_cocoa.h" #include "base/singleton.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/cocoa/accelerators_cocoa.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" diff --git a/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm index 4be2067..c2f9026 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm @@ -8,7 +8,7 @@ #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" #include "chrome/browser/cocoa/bookmarks/bookmark_menu_bridge.h" diff --git a/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm index 534ae66..439bb2c 100644 --- a/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm +++ b/chrome/browser/cocoa/bookmarks/bookmark_menu_cocoa_controller.mm @@ -7,7 +7,7 @@ #include "app/text_elider.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" // IDC_BOOKMARK_MENU +#include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" diff --git a/chrome/browser/cocoa/browser_window_cocoa.mm b/chrome/browser/cocoa/browser_window_cocoa.mm index 03fc6c0..5e21af0 100644 --- a/chrome/browser/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/cocoa/browser_window_cocoa.mm @@ -9,7 +9,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/cocoa/browser_window_controller.h b/chrome/browser/cocoa/browser_window_controller.h index efa49ab..39bd9c4 100644 --- a/chrome/browser/cocoa/browser_window_controller.h +++ b/chrome/browser/cocoa/browser_window_controller.h @@ -217,7 +217,7 @@ class TabContents; // Executes the command in the context of the current browser. // |command| is an integer value containing one of the constants defined in the -// "chrome/app/chrome_dll_resource.h" file. +// "chrome/app/chrome_command_ids.h" file. - (void)executeCommand:(int)command; // Delegate method for the status bubble to query its base frame. diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index 70b74a9..0e39267b 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -13,7 +13,7 @@ #include "base/nsimage_cache_mac.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" // IDC_* +#include "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/cocoa/browser_window_controller_unittest.mm b/chrome/browser/cocoa/browser_window_controller_unittest.mm index a6fda62..4e3a5ac 100644 --- a/chrome/browser/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/cocoa/browser_window_controller_unittest.mm @@ -5,7 +5,7 @@ #include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/cocoa/browser_test_helper.h" diff --git a/chrome/browser/cocoa/chrome_event_processing_window_unittest.mm b/chrome/browser/cocoa/chrome_event_processing_window_unittest.mm index e1db1bc..ebcd3f3 100644 --- a/chrome/browser/cocoa/chrome_event_processing_window_unittest.mm +++ b/chrome/browser/cocoa/chrome_event_processing_window_unittest.mm @@ -4,7 +4,7 @@ #include "base/debug/debugger.h" #include "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/cocoa/chrome_event_processing_window.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/browser_frame_view.h" diff --git a/chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm b/chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm index bb7d67b..afba4b0 100644 --- a/chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm +++ b/chrome/browser/cocoa/encoding_menu_controller_delegate_mac.mm @@ -8,7 +8,7 @@ #include "base/string16.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/cocoa/framed_browser_window_unittest.mm b/chrome/browser/cocoa/framed_browser_window_unittest.mm index bf46fdd..5638561 100644 --- a/chrome/browser/cocoa/framed_browser_window_unittest.mm +++ b/chrome/browser/cocoa/framed_browser_window_unittest.mm @@ -6,7 +6,7 @@ #include "base/debug/debugger.h" #include "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/browser_frame_view.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/cocoa/history_menu_bridge.mm b/chrome/browser/cocoa/history_menu_bridge.mm index 844ca38..0b975ec 100644 --- a/chrome/browser/cocoa/history_menu_bridge.mm +++ b/chrome/browser/cocoa/history_menu_bridge.mm @@ -11,7 +11,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" // IDC_HISTORY_MENU +#include "chrome/app/chrome_command_ids.h" // IDC_HISTORY_MENU #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/cocoa/history_menu_cocoa_controller.h" #include "chrome/browser/history/page_usage_data.h" diff --git a/chrome/browser/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/cocoa/history_menu_bridge_unittest.mm index a3fd2b6..399f510 100644 --- a/chrome/browser/cocoa/history_menu_bridge_unittest.mm +++ b/chrome/browser/cocoa/history_menu_bridge_unittest.mm @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/cancelable_request.h" #include "chrome/browser/cocoa/browser_test_helper.h" diff --git a/chrome/browser/cocoa/history_menu_cocoa_controller.mm b/chrome/browser/cocoa/history_menu_cocoa_controller.mm index 1b6241e..cf6cb18 100644 --- a/chrome/browser/cocoa/history_menu_cocoa_controller.mm +++ b/chrome/browser/cocoa/history_menu_cocoa_controller.mm @@ -5,7 +5,7 @@ #import "chrome/browser/cocoa/history_menu_cocoa_controller.h" #include "base/scoped_vector.h" -#include "chrome/app/chrome_dll_resource.h" // IDC_HISTORY_MENU +#include "chrome/app/chrome_command_ids.h" // IDC_HISTORY_MENU #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/cocoa/history_menu_cocoa_controller_unittest.mm b/chrome/browser/cocoa/history_menu_cocoa_controller_unittest.mm index a57e12b..605e2ba 100644 --- a/chrome/browser/cocoa/history_menu_cocoa_controller_unittest.mm +++ b/chrome/browser/cocoa/history_menu_cocoa_controller_unittest.mm @@ -6,7 +6,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/cocoa/browser_test_helper.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" diff --git a/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.mm b/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.mm index 4904e50..aa5d391 100644 --- a/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.mm +++ b/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor.mm @@ -8,7 +8,7 @@ #include "base/string_util.h" #include "grit/generated_resources.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" // IDC_* +#include "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/browser_list.h" #import "chrome/browser/cocoa/browser_window_controller.h" #import "chrome/browser/cocoa/location_bar/autocomplete_text_field.h" diff --git a/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm b/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm index fc21da0..21ad21a 100644 --- a/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm +++ b/chrome/browser/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm @@ -7,7 +7,7 @@ #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/app/chrome_dll_resource.h" // IDC_* +#include "chrome/app/chrome_command_ids.h" // IDC_* #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/location_bar/autocomplete_text_field_unittest_helper.h" #import "chrome/browser/cocoa/test_event_utils.h" diff --git a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm index d312ab0..f469b80 100644 --- a/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/cocoa/location_bar/location_bar_view_mac.mm @@ -11,7 +11,7 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/alternate_nav_url_fetcher.h" #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" diff --git a/chrome/browser/cocoa/location_bar/star_decoration.mm b/chrome/browser/cocoa/location_bar/star_decoration.mm index adedd16..0d91929 100644 --- a/chrome/browser/cocoa/location_bar/star_decoration.mm +++ b/chrome/browser/cocoa/location_bar/star_decoration.mm @@ -5,7 +5,7 @@ #import "chrome/browser/cocoa/location_bar/star_decoration.h" #include "app/l10n_util_mac.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #include "chrome/browser/command_updater.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/reload_button.mm b/chrome/browser/cocoa/reload_button.mm index a707ef5..9975db7 100644 --- a/chrome/browser/cocoa/reload_button.mm +++ b/chrome/browser/cocoa/reload_button.mm @@ -7,7 +7,7 @@ #include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/nsimage_cache_mac.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/cocoa/gradient_button_cell.h" #import "chrome/browser/cocoa/view_id_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/cocoa/reload_button_unittest.mm b/chrome/browser/cocoa/reload_button_unittest.mm index e5e18af..19fde82 100644 --- a/chrome/browser/cocoa/reload_button_unittest.mm +++ b/chrome/browser/cocoa/reload_button_unittest.mm @@ -7,7 +7,7 @@ #import "chrome/browser/cocoa/reload_button.h" #include "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/test_event_utils.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm index 72c557a..8d062139 100644 --- a/chrome/browser/cocoa/tab_strip_controller.mm +++ b/chrome/browser/cocoa/tab_strip_controller.mm @@ -14,7 +14,7 @@ #include "base/mac_util.h" #include "base/nsimage_cache_mac.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_navigator.h" #include "chrome/browser/find_bar.h" diff --git a/chrome/browser/cocoa/tabpose_window.mm b/chrome/browser/cocoa/tabpose_window.mm index 33fcb6a..dde7caf 100644 --- a/chrome/browser/cocoa/tabpose_window.mm +++ b/chrome/browser/cocoa/tabpose_window.mm @@ -11,7 +11,7 @@ #include "base/mac/scoped_cftyperef.h" #include "base/scoped_callback_factory.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #import "chrome/browser/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/cocoa/browser_window_controller.h" diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm index 4405b3f..25e031b 100644 --- a/chrome/browser/cocoa/toolbar_controller.mm +++ b/chrome/browser/cocoa/toolbar_controller.mm @@ -14,7 +14,7 @@ #include "base/nsimage_cache_mac.h" #include "base/singleton.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/cocoa/toolbar_controller_unittest.mm b/chrome/browser/cocoa/toolbar_controller_unittest.mm index 03914c6..43fbafb 100644 --- a/chrome/browser/cocoa/toolbar_controller_unittest.mm +++ b/chrome/browser/cocoa/toolbar_controller_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #import "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/gradient_button_cell.h" diff --git a/chrome/browser/cocoa/translate/translate_infobar_base.mm b/chrome/browser/cocoa/translate/translate_infobar_base.mm index bdc34f0..48ce514 100644 --- a/chrome/browser/cocoa/translate/translate_infobar_base.mm +++ b/chrome/browser/cocoa/translate/translate_infobar_base.mm @@ -10,7 +10,7 @@ #include "base/mac_util.h" #include "base/metrics/histogram.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/cocoa/hover_close_button.h" #include "chrome/browser/cocoa/infobar.h" #import "chrome/browser/cocoa/infobar_controller.h" diff --git a/chrome/browser/cocoa/translate/translate_infobar_unittest.mm b/chrome/browser/cocoa/translate/translate_infobar_unittest.mm index a389eba..fbe85b0 100644 --- a/chrome/browser/cocoa/translate/translate_infobar_unittest.mm +++ b/chrome/browser/cocoa/translate/translate_infobar_unittest.mm @@ -7,7 +7,7 @@ #import "base/scoped_nsobject.h" #import "base/string_util.h" #include "base/utf_string_conversions.h" -#import "chrome/app/chrome_dll_resource.h" // For translate menu command ids. +#import "chrome/app/chrome_command_ids.h" // For translate menu command ids. #import "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/infobar.h" diff --git a/chrome/browser/cocoa/wrench_menu_button_cell_unittest.mm b/chrome/browser/cocoa/wrench_menu_button_cell_unittest.mm index e736fdc..b24ad50 100644 --- a/chrome/browser/cocoa/wrench_menu_button_cell_unittest.mm +++ b/chrome/browser/cocoa/wrench_menu_button_cell_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/wrench_menu_button_cell.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/cocoa/wrench_menu_controller.mm b/chrome/browser/cocoa/wrench_menu_controller.mm index 5b0a92a..7cecb71 100644 --- a/chrome/browser/cocoa/wrench_menu_controller.mm +++ b/chrome/browser/cocoa/wrench_menu_controller.mm @@ -7,7 +7,7 @@ #include "app/l10n_util.h" #include "app/menus/menu_model.h" #include "base/sys_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" #import "chrome/browser/cocoa/menu_tracked_root_view.h" diff --git a/chrome/browser/cocoa/wrench_menu_controller_unittest.mm b/chrome/browser/cocoa/wrench_menu_controller_unittest.mm index 446bd80..1018666 100644 --- a/chrome/browser/cocoa/wrench_menu_controller_unittest.mm +++ b/chrome/browser/cocoa/wrench_menu_controller_unittest.mm @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/cocoa/browser_test_helper.h" #import "chrome/browser/cocoa/cocoa_test_helper.h" #import "chrome/browser/cocoa/toolbar_controller.h" |