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 | |
| 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
129 files changed, 407 insertions, 414 deletions
diff --git a/chrome/app/chrome_command_ids.h b/chrome/app/chrome_command_ids.h new file mode 100644 index 0000000..5c3e66d --- /dev/null +++ b/chrome/app/chrome_command_ids.h @@ -0,0 +1,275 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// This file lists all the command IDs understood by e.g. the browser. +// It is used by Windows RC files, Mac NIB files, and other platforms too. + +#define IDC_View 4000 +#define IDC_ViewHost 4001 +#define IDC_Plugin 4002 +#define IDC_PluginHost 4003 +#define IDC_NPObject 4004 +#define IDC_PluginProcess 4005 +#define IDC_PluginProcessHost 4006 +#define IDC_ViewAll 4007 +#define IDC_ViewNone 4008 +#define IDC_ViewHostAll 4009 +#define IDC_ViewHostNone 4010 +#define IDC_PluginAll 4011 +#define IDC_PluginNone 4012 +#define IDC_NPObjectAll 4013 +#define IDC_NPObjectNone 4014 +#define IDC_PluginHostAll 4015 +#define IDC_PluginHostNone 4016 +#define IDC_DevToolsAgent 4017 +#define IDC_DevToolsClient 4018 + +// NOTE: Within each of the following sections, the IDs are ordered roughly by +// how they appear in the GUI/menus (left to right, top to bottom, etc.). + +// Navigation commands +// TODO: Reorder to be in visible order; collapse holes +#define IDC_BACK 33000 +#define IDC_FORWARD 33001 +#define IDC_RELOAD 33002 +#define IDC_HOME 33003 +#define IDC_OPEN_CURRENT_URL 33004 +#define IDC_STOP 33006 +#define IDC_RELOAD_IGNORING_CACHE 33007 + +// Window management commands +#define IDC_NEW_WINDOW 34000 +#define IDC_NEW_INCOGNITO_WINDOW 34001 +#define IDC_CLOSE_WINDOW 34012 +#define IDC_ALWAYS_ON_TOP 34013 +#define IDC_NEW_TAB 34014 +#define IDC_CLOSE_TAB 34015 +#define IDC_SELECT_NEXT_TAB 34016 +#define IDC_SELECT_PREVIOUS_TAB 34017 +#define IDC_SELECT_TAB_0 34018 +#define IDC_SELECT_TAB_1 34019 +#define IDC_SELECT_TAB_2 34020 +#define IDC_SELECT_TAB_3 34021 +#define IDC_SELECT_TAB_4 34022 +#define IDC_SELECT_TAB_5 34023 +#define IDC_SELECT_TAB_6 34024 +#define IDC_SELECT_TAB_7 34025 +#define IDC_SELECT_LAST_TAB 34026 +#define IDC_DUPLICATE_TAB 34027 +#define IDC_RESTORE_TAB 34028 +#define IDC_SHOW_AS_TAB 34029 +#define IDC_FULLSCREEN 34030 +#define IDC_EXIT 34031 +#define IDC_MOVE_TAB_NEXT 34032 +#define IDC_MOVE_TAB_PREVIOUS 34033 +#define IDC_TOGGLE_VERTICAL_TABS 34034 +#define IDC_SEARCH 34035 +#define IDC_TABPOSE 34036 + +// Page-related commands +#define IDC_BOOKMARK_PAGE 35000 +#define IDC_BOOKMARK_ALL_TABS 35001 +#define IDC_VIEW_SOURCE 35002 +#define IDC_PRINT 35003 +#define IDC_SAVE_PAGE 35004 +#define IDC_ENCODING_MENU 35005 +#define IDC_EMAIL_PAGE_LOCATION 35006 + +// When adding a new encoding to this list, be sure to append it to the +// EncodingMenuController::kValidEncodingIds array in +// encoding_menu_controller.cc. +#define IDC_ENCODING_AUTO_DETECT 35500 +#define IDC_ENCODING_UTF8 35501 +#define IDC_ENCODING_UTF16LE 35502 +#define IDC_ENCODING_ISO88591 35503 +#define IDC_ENCODING_WINDOWS1252 35504 +#define IDC_ENCODING_GBK 35505 +#define IDC_ENCODING_GB18030 35506 +#define IDC_ENCODING_BIG5 35507 +#define IDC_ENCODING_BIG5HKSCS 35508 +#define IDC_ENCODING_KOREAN 35509 +#define IDC_ENCODING_SHIFTJIS 35510 +#define IDC_ENCODING_ISO2022JP 35511 +#define IDC_ENCODING_EUCJP 35512 +#define IDC_ENCODING_THAI 35513 +#define IDC_ENCODING_ISO885915 35514 +#define IDC_ENCODING_MACINTOSH 35515 +#define IDC_ENCODING_ISO88592 35516 +#define IDC_ENCODING_WINDOWS1250 35517 +#define IDC_ENCODING_ISO88595 35518 +#define IDC_ENCODING_WINDOWS1251 35519 +#define IDC_ENCODING_KOI8R 35520 +#define IDC_ENCODING_KOI8U 35521 +#define IDC_ENCODING_ISO88597 35522 +#define IDC_ENCODING_WINDOWS1253 35523 +#define IDC_ENCODING_ISO88594 35524 +#define IDC_ENCODING_ISO885913 35525 +#define IDC_ENCODING_WINDOWS1257 35526 +#define IDC_ENCODING_ISO88593 35527 +#define IDC_ENCODING_ISO885910 35528 +#define IDC_ENCODING_ISO885914 35529 +#define IDC_ENCODING_ISO885916 35530 +#define IDC_ENCODING_WINDOWS1254 35531 +#define IDC_ENCODING_ISO88596 35532 +#define IDC_ENCODING_WINDOWS1256 35533 +#define IDC_ENCODING_ISO88598 35534 +#define IDC_ENCODING_WINDOWS1255 35535 +#define IDC_ENCODING_WINDOWS1258 35536 +#define IDC_ENCODING_ISO88598I 35537 + +// Clipboard commands +#define IDC_CUT 36000 +#define IDC_COPY 36001 +#define IDC_COPY_URL 36002 +#define IDC_PASTE 36003 +#define IDC_EDIT_MENU 36004 + +// Find-in-page +#define IDC_FIND 37000 +#define IDC_FIND_NEXT 37001 +#define IDC_FIND_PREVIOUS 37002 + +// Zoom +#define IDC_ZOOM_MENU 38000 +#define IDC_ZOOM_PLUS 38001 +#define IDC_ZOOM_NORMAL 38002 +#define IDC_ZOOM_MINUS 38003 +#define IDC_ZOOM_PERCENT_DISPLAY 38004 + +// Focus various bits of UI +#define IDC_FOCUS_TOOLBAR 39000 +#define IDC_FOCUS_LOCATION 39001 +#define IDC_FOCUS_SEARCH 39002 +#define IDC_FOCUS_MENU_BAR 39003 +#define IDC_FOCUS_NEXT_PANE 39004 +#define IDC_FOCUS_PREVIOUS_PANE 39005 +#define IDC_FOCUS_BOOKMARKS 39006 +#define IDC_FOCUS_CHROMEOS_STATUS 39007 + +// Show various bits of UI +#define IDC_OPEN_FILE 40000 +#define IDC_CREATE_SHORTCUTS 40001 +#define IDC_DEVELOPER_MENU 40002 +#define IDC_DEV_TOOLS 40003 +#define IDC_DEV_TOOLS_CONSOLE 40004 +#define IDC_TASK_MANAGER 40005 +#define IDC_REPORT_BUG 40008 +#define IDC_SHOW_BOOKMARK_BAR 40009 +#define IDC_SHOW_HISTORY 40010 +#define IDC_SHOW_BOOKMARK_MANAGER 40011 +#define IDC_SHOW_DOWNLOADS 40012 +#define IDC_CLEAR_BROWSING_DATA 40013 +#define IDC_IMPORT_SETTINGS 40014 +#define IDC_OPTIONS 40015 +#define IDC_EDIT_SEARCH_ENGINES 40016 +#define IDC_VIEW_PASSWORDS 40017 +#define IDC_ABOUT 40018 +#define IDC_HELP_PAGE 40019 +#define IDC_SHOW_APP_MENU 40020 +#define IDC_MANAGE_EXTENSIONS 40022 +#define IDC_AUTOFILL_DEFAULT 40023 +#define IDC_DEV_TOOLS_INSPECT 40025 +#define IDC_UPGRADE_DIALOG 40026 +#define IDC_VIEW_INCOMPATIBILITIES 40027 + +// Spell-check +// Insert any additional suggestions before _LAST; these have to be consecutive. +#define IDC_SPELLCHECK_SUGGESTION_0 41000 +#define IDC_SPELLCHECK_SUGGESTION_1 41001 +#define IDC_SPELLCHECK_SUGGESTION_2 41002 +#define IDC_SPELLCHECK_SUGGESTION_3 41003 +#define IDC_SPELLCHECK_SUGGESTION_4 41004 +#define IDC_SPELLCHECK_SUGGESTION_LAST IDC_SPELLCHECK_SUGGESTION_4 +#define IDC_SPELLCHECK_MENU 41005 +// Language entries are inserted using autogenerated values between +// [_FIRST, _LAST). +#define IDC_SPELLCHECK_LANGUAGES_FIRST 41006 +#define IDC_SPELLCHECK_LANGUAGES_LAST 41106 +#define IDC_CHECK_SPELLING_OF_THIS_FIELD 41107 +#define IDC_SYNC_BOOKMARKS 41108 +#define IDC_SPELLPANEL_TOGGLE 41109 +#define IDC_SPELLCHECK_ADD_TO_DICTIONARY 41110 + +// Writing direction +#define IDC_WRITING_DIRECTION_MENU 41120 // OSX only +#define IDC_WRITING_DIRECTION_DEFAULT 41121 // OSX only +#define IDC_WRITING_DIRECTION_LTR 41122 // OSX only +#define IDC_WRITING_DIRECTION_RTL 41123 // OSX only + +// Remoting +#define IDC_REMOTING_SETUP 41140 + +// Translate +#define IDC_TRANSLATE_OPTIONS_ALWAYS 42000 +#define IDC_TRANSLATE_OPTIONS_NEVER_TRANSLATE_LANG 42001 +#define IDC_TRANSLATE_OPTIONS_NEVER_TRANSLATE_SITE 42002 +#define IDC_TRANSLATE_REPORT_BAD_LANGUAGE_DETECTION 42003 +#define IDC_TRANSLATE_OPTIONS_ABOUT 42004 +#define IDC_TRANSLATE_ORIGINAL_LANGUAGE_BASE 42100 +#define IDC_TRANSLATE_TARGET_LANGUAGE_BASE 42400 + +// Identifiers for platform-specific items. +// Placed in a common file to help insure they never collide. +#define IDC_BOOKMARK_MENU 43000 // OSX only +#define IDC_VIEW_MENU 44000 // OSX only +#define IDC_SYSTEM_OPTIONS 45000 // ChromeOS only +#define IDC_INTERNET_OPTIONS 45100 // ChromeOS only +#define IDC_LANGUAGE_OPTIONS 45200 // ChromeOS only +#define IDC_HISTORY_MENU 46000 // OSX only +#define IDC_INPUT_METHODS_MENU 46300 // Linux only + +// Custom context menu entries +#define IDC_CONTENT_CONTEXT_CUSTOM_FIRST 47000 +#define IDC_CONTENT_CONTEXT_CUSTOM_LAST 48000 + +// Context menu items added by extensions. +#define IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST 49000 +#define IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST 50000 + +// Context menu items in the render view. +// Link items. +#define IDC_CONTENT_CONTEXT_OPENLINKNEWTAB 50100 +#define IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW 50101 +#define IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD 50102 +#define IDC_CONTENT_CONTEXT_SAVELINKAS 50103 +#define IDC_CONTENT_CONTEXT_COPYLINKLOCATION 50104 +#define IDC_CONTENT_CONTEXT_COPYEMAILADDRESS 50105 +// Image items. +#define IDC_CONTENT_CONTEXT_SAVEIMAGEAS 50110 +#define IDC_CONTENT_CONTEXT_COPYIMAGELOCATION 50111 +#define IDC_CONTENT_CONTEXT_COPYIMAGE 50112 +#define IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB 50113 +// Audio/video items. +#define IDC_CONTENT_CONTEXT_SAVEAVAS 50120 +#define IDC_CONTENT_CONTEXT_COPYAVLOCATION 50121 +#define IDC_CONTENT_CONTEXT_OPENAVNEWTAB 50122 +// Media items. +#define IDC_CONTENT_CONTEXT_PLAYPAUSE 50130 +#define IDC_CONTENT_CONTEXT_MUTE 50131 +#define IDC_CONTENT_CONTEXT_LOOP 50132 +#define IDC_CONTENT_CONTEXT_CONTROLS 50133 +// Edit items. +#define IDC_CONTENT_CONTEXT_COPY 50140 +#define IDC_CONTENT_CONTEXT_CUT 50141 +#define IDC_CONTENT_CONTEXT_PASTE 50142 +#define IDC_CONTENT_CONTEXT_DELETE 50143 +#define IDC_CONTENT_CONTEXT_UNDO 50144 +#define IDC_CONTENT_CONTEXT_REDO 50145 +#define IDC_CONTENT_CONTEXT_SELECTALL 50146 +// Other items. +#define IDC_CONTENT_CONTEXT_TRANSLATE 50150 +#define IDC_CONTENT_CONTEXT_INSPECTELEMENT 50151 +#define IDC_CONTENT_CONTEXT_VIEWPAGEINFO 50152 +#define IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS 50153 +#define IDC_CONTENT_CONTEXT_LOOK_UP_IN_DICTIONARY 50154 +// Frame items. +#define IDC_CONTENT_CONTEXT_RELOADFRAME 50160 +#define IDC_CONTENT_CONTEXT_OPENFRAMENEWTAB 50161 +#define IDC_CONTENT_CONTEXT_OPENFRAMENEWWINDOW 50162 +#define IDC_CONTENT_CONTEXT_OPENFRAMEOFFTHERECORD 50163 +#define IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE 50164 +#define IDC_CONTENT_CONTEXT_VIEWFRAMEINFO 50165 +// Search items. +#define IDC_CONTENT_CONTEXT_GOTOURL 50170 +#define IDC_CONTENT_CONTEXT_SEARCHWEBFOR 50171 diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index d144d36..43f84b7 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -2,14 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -//{{NO_DEPENDENCIES}} -// -// What began as a Microsoft Visual C++ generated include file is now -// edited by hand. Do not generate!!! -// -// Used by chrome_dll.rc, Mac nibs, ... -// - #define IDR_MAINFRAME 101 #define IDR_CHROMEFRAME 200 @@ -43,284 +35,3 @@ #define IDD_IPC_SETTINGS 3000 -#define IDC_View 4000 -#define IDC_ViewHost 4001 -#define IDC_Plugin 4002 -#define IDC_PluginHost 4003 -#define IDC_NPObject 4004 -#define IDC_PluginProcess 4005 -#define IDC_PluginProcessHost 4006 -#define IDC_ViewAll 4007 -#define IDC_ViewNone 4008 -#define IDC_ViewHostAll 4009 -#define IDC_ViewHostNone 4010 -#define IDC_PluginAll 4011 -#define IDC_PluginNone 4012 -#define IDC_NPObjectAll 4013 -#define IDC_NPObjectNone 4014 -#define IDC_PluginHostAll 4015 -#define IDC_PluginHostNone 4016 -#define IDC_DevToolsAgent 4017 -#define IDC_DevToolsClient 4018 - -// NOTE: Within each of the following sections, the IDs are ordered roughly by -// how they appear in the GUI/menus (left to right, top to bottom, etc.). - -// Navigation commands -// TODO: Reorder to be in visible order; collapse holes -#define IDC_BACK 33000 -#define IDC_FORWARD 33001 -#define IDC_RELOAD 33002 -#define IDC_HOME 33003 -#define IDC_OPEN_CURRENT_URL 33004 -#define IDC_STOP 33006 -#define IDC_RELOAD_IGNORING_CACHE 33007 - -// Window management commands -#define IDC_NEW_WINDOW 34000 -#define IDC_NEW_INCOGNITO_WINDOW 34001 -#define IDC_CLOSE_WINDOW 34012 -#define IDC_ALWAYS_ON_TOP 34013 -#define IDC_NEW_TAB 34014 -#define IDC_CLOSE_TAB 34015 -#define IDC_SELECT_NEXT_TAB 34016 -#define IDC_SELECT_PREVIOUS_TAB 34017 -#define IDC_SELECT_TAB_0 34018 -#define IDC_SELECT_TAB_1 34019 -#define IDC_SELECT_TAB_2 34020 -#define IDC_SELECT_TAB_3 34021 -#define IDC_SELECT_TAB_4 34022 -#define IDC_SELECT_TAB_5 34023 -#define IDC_SELECT_TAB_6 34024 -#define IDC_SELECT_TAB_7 34025 -#define IDC_SELECT_LAST_TAB 34026 -#define IDC_DUPLICATE_TAB 34027 -#define IDC_RESTORE_TAB 34028 -#define IDC_SHOW_AS_TAB 34029 -#define IDC_FULLSCREEN 34030 -#define IDC_EXIT 34031 -#define IDC_MOVE_TAB_NEXT 34032 -#define IDC_MOVE_TAB_PREVIOUS 34033 -#define IDC_TOGGLE_VERTICAL_TABS 34034 -#define IDC_SEARCH 34035 -#define IDC_TABPOSE 34036 - -// Page-related commands -#define IDC_BOOKMARK_PAGE 35000 -#define IDC_BOOKMARK_ALL_TABS 35001 -#define IDC_VIEW_SOURCE 35002 -#define IDC_PRINT 35003 -#define IDC_SAVE_PAGE 35004 -#define IDC_ENCODING_MENU 35005 -#define IDC_EMAIL_PAGE_LOCATION 35006 - -// When adding a new encoding to this list, be sure to append it to the -// EncodingMenuController::kValidEncodingIds array in -// encoding_menu_controller.cc. -#define IDC_ENCODING_AUTO_DETECT 35500 -#define IDC_ENCODING_UTF8 35501 -#define IDC_ENCODING_UTF16LE 35502 -#define IDC_ENCODING_ISO88591 35503 -#define IDC_ENCODING_WINDOWS1252 35504 -#define IDC_ENCODING_GBK 35505 -#define IDC_ENCODING_GB18030 35506 -#define IDC_ENCODING_BIG5 35507 -#define IDC_ENCODING_BIG5HKSCS 35508 -#define IDC_ENCODING_KOREAN 35509 -#define IDC_ENCODING_SHIFTJIS 35510 -#define IDC_ENCODING_ISO2022JP 35511 -#define IDC_ENCODING_EUCJP 35512 -#define IDC_ENCODING_THAI 35513 -#define IDC_ENCODING_ISO885915 35514 -#define IDC_ENCODING_MACINTOSH 35515 -#define IDC_ENCODING_ISO88592 35516 -#define IDC_ENCODING_WINDOWS1250 35517 -#define IDC_ENCODING_ISO88595 35518 -#define IDC_ENCODING_WINDOWS1251 35519 -#define IDC_ENCODING_KOI8R 35520 -#define IDC_ENCODING_KOI8U 35521 -#define IDC_ENCODING_ISO88597 35522 -#define IDC_ENCODING_WINDOWS1253 35523 -#define IDC_ENCODING_ISO88594 35524 -#define IDC_ENCODING_ISO885913 35525 -#define IDC_ENCODING_WINDOWS1257 35526 -#define IDC_ENCODING_ISO88593 35527 -#define IDC_ENCODING_ISO885910 35528 -#define IDC_ENCODING_ISO885914 35529 -#define IDC_ENCODING_ISO885916 35530 -#define IDC_ENCODING_WINDOWS1254 35531 -#define IDC_ENCODING_ISO88596 35532 -#define IDC_ENCODING_WINDOWS1256 35533 -#define IDC_ENCODING_ISO88598 35534 -#define IDC_ENCODING_WINDOWS1255 35535 -#define IDC_ENCODING_WINDOWS1258 35536 -#define IDC_ENCODING_ISO88598I 35537 - -// Clipboard commands -#define IDC_CUT 36000 -#define IDC_COPY 36001 -#define IDC_COPY_URL 36002 -#define IDC_PASTE 36003 -#define IDC_EDIT_MENU 36004 - -// Find-in-page -#define IDC_FIND 37000 -#define IDC_FIND_NEXT 37001 -#define IDC_FIND_PREVIOUS 37002 - -// Zoom -#define IDC_ZOOM_MENU 38000 -#define IDC_ZOOM_PLUS 38001 -#define IDC_ZOOM_NORMAL 38002 -#define IDC_ZOOM_MINUS 38003 -#define IDC_ZOOM_PERCENT_DISPLAY 38004 - -// Focus various bits of UI -#define IDC_FOCUS_TOOLBAR 39000 -#define IDC_FOCUS_LOCATION 39001 -#define IDC_FOCUS_SEARCH 39002 -#define IDC_FOCUS_MENU_BAR 39003 -#define IDC_FOCUS_NEXT_PANE 39004 -#define IDC_FOCUS_PREVIOUS_PANE 39005 -#define IDC_FOCUS_BOOKMARKS 39006 -#define IDC_FOCUS_CHROMEOS_STATUS 39007 - -// Show various bits of UI -#define IDC_OPEN_FILE 40000 -#define IDC_CREATE_SHORTCUTS 40001 -#define IDC_DEVELOPER_MENU 40002 -#define IDC_DEV_TOOLS 40003 -#define IDC_DEV_TOOLS_CONSOLE 40004 -#define IDC_TASK_MANAGER 40005 -#define IDC_REPORT_BUG 40008 -#define IDC_SHOW_BOOKMARK_BAR 40009 -#define IDC_SHOW_HISTORY 40010 -#define IDC_SHOW_BOOKMARK_MANAGER 40011 -#define IDC_SHOW_DOWNLOADS 40012 -#define IDC_CLEAR_BROWSING_DATA 40013 -#define IDC_IMPORT_SETTINGS 40014 -#define IDC_OPTIONS 40015 -#define IDC_EDIT_SEARCH_ENGINES 40016 -#define IDC_VIEW_PASSWORDS 40017 -#define IDC_ABOUT 40018 -#define IDC_HELP_PAGE 40019 -#define IDC_SHOW_APP_MENU 40020 -#define IDC_MANAGE_EXTENSIONS 40022 -#define IDC_AUTOFILL_DEFAULT 40023 -#define IDC_DEV_TOOLS_INSPECT 40025 -#define IDC_UPGRADE_DIALOG 40026 -#define IDC_VIEW_INCOMPATIBILITIES 40027 - -// Spell-check -// Insert any additional suggestions before _LAST; these have to be consecutive. -#define IDC_SPELLCHECK_SUGGESTION_0 41000 -#define IDC_SPELLCHECK_SUGGESTION_1 41001 -#define IDC_SPELLCHECK_SUGGESTION_2 41002 -#define IDC_SPELLCHECK_SUGGESTION_3 41003 -#define IDC_SPELLCHECK_SUGGESTION_4 41004 -#define IDC_SPELLCHECK_SUGGESTION_LAST IDC_SPELLCHECK_SUGGESTION_4 -#define IDC_SPELLCHECK_MENU 41005 -// Language entries are inserted using autogenerated values between -// [_FIRST, _LAST). -#define IDC_SPELLCHECK_LANGUAGES_FIRST 41006 -#define IDC_SPELLCHECK_LANGUAGES_LAST 41106 -#define IDC_CHECK_SPELLING_OF_THIS_FIELD 41107 -#define IDC_SYNC_BOOKMARKS 41108 -#define IDC_SPELLPANEL_TOGGLE 41109 -#define IDC_SPELLCHECK_ADD_TO_DICTIONARY 41110 - -// Writing direction -#define IDC_WRITING_DIRECTION_MENU 41120 // OSX only -#define IDC_WRITING_DIRECTION_DEFAULT 41121 // OSX only -#define IDC_WRITING_DIRECTION_LTR 41122 // OSX only -#define IDC_WRITING_DIRECTION_RTL 41123 // OSX only - -// Remoting -#define IDC_REMOTING_SETUP 41140 - -// Translate -#define IDC_TRANSLATE_OPTIONS_ALWAYS 42000 -#define IDC_TRANSLATE_OPTIONS_NEVER_TRANSLATE_LANG 42001 -#define IDC_TRANSLATE_OPTIONS_NEVER_TRANSLATE_SITE 42002 -#define IDC_TRANSLATE_REPORT_BAD_LANGUAGE_DETECTION 42003 -#define IDC_TRANSLATE_OPTIONS_ABOUT 42004 -#define IDC_TRANSLATE_ORIGINAL_LANGUAGE_BASE 42100 -#define IDC_TRANSLATE_TARGET_LANGUAGE_BASE 42400 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#pragma once -#define _APS_NEXT_RESOURCE_VALUE 3001 -#define _APS_NEXT_COMMAND_VALUE 43000 -#define _APS_NEXT_CONTROL_VALUE 4017 -#define _APS_NEXT_SYMED_VALUE 1001 -#endif -#endif - -// Identifiers for platform-specific items. -// Placed in a common file to help insure they never collide. -#define IDC_BOOKMARK_MENU 43000 // OSX only -#define IDC_VIEW_MENU 44000 // OSX only -#define IDC_SYSTEM_OPTIONS 45000 // ChromeOS only -#define IDC_INTERNET_OPTIONS 45100 // ChromeOS only -#define IDC_LANGUAGE_OPTIONS 45200 // ChromeOS only -#define IDC_HISTORY_MENU 46000 // OSX only -#define IDC_INPUT_METHODS_MENU 46300 // Linux only - -// Custom context menu entries -#define IDC_CONTENT_CONTEXT_CUSTOM_FIRST 47000 -#define IDC_CONTENT_CONTEXT_CUSTOM_LAST 48000 - -// Context menu items added by extensions. -#define IDC_EXTENSIONS_CONTEXT_CUSTOM_FIRST 49000 -#define IDC_EXTENSIONS_CONTEXT_CUSTOM_LAST 50000 - -// Context menu items in the render view. -// Link items. -#define IDC_CONTENT_CONTEXT_OPENLINKNEWTAB 50100 -#define IDC_CONTENT_CONTEXT_OPENLINKNEWWINDOW 50101 -#define IDC_CONTENT_CONTEXT_OPENLINKOFFTHERECORD 50102 -#define IDC_CONTENT_CONTEXT_SAVELINKAS 50103 -#define IDC_CONTENT_CONTEXT_COPYLINKLOCATION 50104 -#define IDC_CONTENT_CONTEXT_COPYEMAILADDRESS 50105 -// Image items. -#define IDC_CONTENT_CONTEXT_SAVEIMAGEAS 50110 -#define IDC_CONTENT_CONTEXT_COPYIMAGELOCATION 50111 -#define IDC_CONTENT_CONTEXT_COPYIMAGE 50112 -#define IDC_CONTENT_CONTEXT_OPENIMAGENEWTAB 50113 -// Audio/video items. -#define IDC_CONTENT_CONTEXT_SAVEAVAS 50120 -#define IDC_CONTENT_CONTEXT_COPYAVLOCATION 50121 -#define IDC_CONTENT_CONTEXT_OPENAVNEWTAB 50122 -// Media items. -#define IDC_CONTENT_CONTEXT_PLAYPAUSE 50130 -#define IDC_CONTENT_CONTEXT_MUTE 50131 -#define IDC_CONTENT_CONTEXT_LOOP 50132 -#define IDC_CONTENT_CONTEXT_CONTROLS 50133 -// Edit items. -#define IDC_CONTENT_CONTEXT_COPY 50140 -#define IDC_CONTENT_CONTEXT_CUT 50141 -#define IDC_CONTENT_CONTEXT_PASTE 50142 -#define IDC_CONTENT_CONTEXT_DELETE 50143 -#define IDC_CONTENT_CONTEXT_UNDO 50144 -#define IDC_CONTENT_CONTEXT_REDO 50145 -#define IDC_CONTENT_CONTEXT_SELECTALL 50146 -// Other items. -#define IDC_CONTENT_CONTEXT_TRANSLATE 50150 -#define IDC_CONTENT_CONTEXT_INSPECTELEMENT 50151 -#define IDC_CONTENT_CONTEXT_VIEWPAGEINFO 50152 -#define IDC_CONTENT_CONTEXT_LANGUAGE_SETTINGS 50153 -#define IDC_CONTENT_CONTEXT_LOOK_UP_IN_DICTIONARY 50154 -// Frame items. -#define IDC_CONTENT_CONTEXT_RELOADFRAME 50160 -#define IDC_CONTENT_CONTEXT_OPENFRAMENEWTAB 50161 -#define IDC_CONTENT_CONTEXT_OPENFRAMENEWWINDOW 50162 -#define IDC_CONTENT_CONTEXT_OPENFRAMEOFFTHERECORD 50163 -#define IDC_CONTENT_CONTEXT_VIEWFRAMESOURCE 50164 -#define IDC_CONTENT_CONTEXT_VIEWFRAMEINFO 50165 -// Search items. -#define IDC_CONTENT_CONTEXT_GOTOURL 50170 -#define IDC_CONTENT_CONTEXT_SEARCHWEBFOR 50171 diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index f05548a..6c8a9f1 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -14,7 +14,7 @@ #include "base/string_number_conversions.h" #include "base/sys_string_conversions.h" #import "base/worker_pool_mac.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_init.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/app_controller_mac_unittest.mm b/chrome/browser/app_controller_mac_unittest.mm index 39cc77e..6af8e13 100644 --- a/chrome/browser/app_controller_mac_unittest.mm +++ b/chrome/browser/app_controller_mac_unittest.mm @@ -5,7 +5,7 @@ #import <Cocoa/Cocoa.h> #include "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" #include "testing/platform_test.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index dc9c0756..ed18232 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -10,7 +10,7 @@ #include "base/metrics/histogram.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/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc index 266e3d4..6a8ef27 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc @@ -10,7 +10,7 @@ #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index c96a188..8ba3b52 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -13,7 +13,7 @@ #include "base/logging.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/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 328d55b..e853c85 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -29,7 +29,7 @@ #include "base/ref_counted.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/autocomplete/autocomplete_accessibility.h" #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index b01813f..cbbc786 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -24,7 +24,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/waitable_event.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/autofill/autofill_manager.h" diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 7cfa96f..d5fb64f 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -12,7 +12,7 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/values.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_provider_json.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 7cf19da..4c2fcce 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -13,8 +13,7 @@ #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "base/stringprintf.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/autocomplete/autocomplete.h" diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc index 203b9b4..06e5439 100644 --- a/chrome/browser/background_mode_manager.cc +++ b/chrome/browser/background_mode_manager.cc @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background_application_list_model.h" #include "chrome/browser/background_mode_manager.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 317695e..c63d6b8 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -9,7 +9,7 @@ #include "base/file_path.h" #include "base/sys_info.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_init.h" diff --git a/chrome/browser/browser_commands_unittest.cc b/chrome/browser/browser_commands_unittest.cc index c5d0f57..667ee35 100644 --- a/chrome/browser/browser_commands_unittest.cc +++ b/chrome/browser/browser_commands_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#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/browser_list.h" diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 8ea721e..5d2c448 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -10,7 +10,7 @@ #include "base/sys_info.h" #include "base/test/test_file_util.h" #include "base/values.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/platform_util.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 8e24b02..80bfc6b 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -14,7 +14,7 @@ #include "base/string_tokenizer.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 "grit/generated_resources.h" #include "unicode/ucnv.h" diff --git a/chrome/browser/chromeos/dom_ui/language_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_options_handler.cc index a3f7056..05570bc 100644 --- a/chrome/browser/chromeos/dom_ui/language_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_options_handler.cc @@ -12,7 +12,7 @@ #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc index 4bdf457..30df58f 100644 --- a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc @@ -8,7 +8,7 @@ #include "base/values.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/chromeos/status/network_menu.h" #include "chrome/browser/chromeos/views/domui_menu_widget.h" diff --git a/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc b/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc index b14e1cd..cbc9c82 100644 --- a/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc @@ -10,7 +10,7 @@ #include "base/utf_string_conversions.h" #include "base/values.h" #include "base/weak_ptr.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/chromeos/views/domui_menu_widget.h" diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc index 52eec9e..a9d95ad 100644 --- a/chrome/browser/chromeos/frame/browser_view.cc +++ b/chrome/browser/chromeos/frame/browser_view.cc @@ -10,7 +10,7 @@ #include "app/menus/simple_menu_model.h" #include "base/command_line.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chromeos/frame/panel_browser_view.h" #include "chrome/browser/chromeos/status/input_method_menu_button.h" #include "chrome/browser/chromeos/status/network_menu_button.h" diff --git a/chrome/browser/chromeos/status/feedback_menu_button.cc b/chrome/browser/chromeos/status/feedback_menu_button.cc index 14efafd..2a0ea52 100644 --- a/chrome/browser/chromeos/status/feedback_menu_button.cc +++ b/chrome/browser/chromeos/status/feedback_menu_button.cc @@ -8,7 +8,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/chromeos/status/status_area_host.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" 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" diff --git a/chrome/browser/collected_cookies_uitest.cc b/chrome/browser/collected_cookies_uitest.cc index 3c2009d..6c241ce 100644 --- a/chrome/browser/collected_cookies_uitest.cc +++ b/chrome/browser/collected_cookies_uitest.cc @@ -4,7 +4,7 @@ #include <string> -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc b/chrome/browser/dom_ui/bookmarks_ui_uitest.cc index 3e3ac33..304c9ac 100644 --- a/chrome/browser/dom_ui/bookmarks_ui_uitest.cc +++ b/chrome/browser/dom_ui/bookmarks_ui_uitest.cc @@ -4,7 +4,7 @@ #include "chrome/test/ui/ui_test.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/url_constants.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/browser/dom_ui/new_tab_ui_uitest.cc b/chrome/browser/dom_ui/new_tab_ui_uitest.cc index 7222405..5be42f5 100644 --- a/chrome/browser/dom_ui/new_tab_ui_uitest.cc +++ b/chrome/browser/dom_ui/new_tab_ui_uitest.cc @@ -4,7 +4,7 @@ #include "chrome/test/ui/ui_test.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/browser/prefs/pref_value_store.h" diff --git a/chrome/browser/dom_ui/options/options_ui_uitest.cc b/chrome/browser/dom_ui/options/options_ui_uitest.cc index d5fa306..6abad48 100644 --- a/chrome/browser/dom_ui/options/options_ui_uitest.cc +++ b/chrome/browser/dom_ui/options/options_ui_uitest.cc @@ -6,7 +6,7 @@ #include "base/command_line.h" #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/automation/browser_proxy.h" diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc index 16db455..f5bae1f 100644 --- a/chrome/browser/download/download_uitest.cc +++ b/chrome/browser/download/download_uitest.cc @@ -16,7 +16,7 @@ #include "base/platform_thread.h" #include "base/string_util.h" #include "base/test/test_file_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_request_mock_http_job.h" #include "chrome/browser/net/url_request_slow_download_job.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index bed7228..fe777e4 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_temp_dir.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" #include "chrome/browser/net/url_request_mock_http_job.h" diff --git a/chrome/browser/download/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc index 07fd78c..e6c6e08 100644 --- a/chrome/browser/download/save_page_uitest.cc +++ b/chrome/browser/download/save_page_uitest.cc @@ -7,7 +7,7 @@ #include "base/platform_thread.h" #include "base/string_util.h" #include "base/test/test_file_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_request_mock_http_job.h" #include "chrome/browser/download/save_package.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/encoding_menu_controller.cc b/chrome/browser/encoding_menu_controller.cc index a286fdf..d53536d 100644 --- a/chrome/browser/encoding_menu_controller.cc +++ b/chrome/browser/encoding_menu_controller.cc @@ -7,7 +7,7 @@ #include "app/l10n_util.h" #include "base/i18n/rtl.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_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/encoding_menu_controller_unittest.cc b/chrome/browser/encoding_menu_controller_unittest.cc index 91cd2a4..ab8b6b5 100644 --- a/chrome/browser/encoding_menu_controller_unittest.cc +++ b/chrome/browser/encoding_menu_controller_unittest.cc @@ -7,7 +7,7 @@ #include <string> #include "base/basictypes.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc index 73f4acf..da83124 100644 --- a/chrome/browser/extensions/extension_context_menu_browsertest.cc +++ b/chrome/browser/extensions/extension_context_menu_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "app/menus/menu_model.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/extensions/extension_browsertest.h" diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index 5f52e46..3368b11 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -12,7 +12,7 @@ #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/win_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_extension_function.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm index 38b5636..6e3f206 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac.mm +++ b/chrome/browser/global_keyboard_shortcuts_mac.mm @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/logging.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" // Basically, there are two kinds of keyboard shortcuts: Ones that should work // only if the tab contents is focused (BrowserKeyboardShortcut), and ones that diff --git a/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm b/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm index 36ab618..4e3ab07 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm +++ b/chrome/browser/global_keyboard_shortcuts_mac_unittest.mm @@ -7,7 +7,7 @@ #include "chrome/browser/global_keyboard_shortcuts_mac.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "testing/gtest/include/gtest/gtest.h" TEST(GlobalKeyboardShortcuts, ShortcutsToWindowCommand) { diff --git a/chrome/browser/gtk/accelerators_gtk.cc b/chrome/browser/gtk/accelerators_gtk.cc index 9d7a5b9..c0a2f73 100644 --- a/chrome/browser/gtk/accelerators_gtk.cc +++ b/chrome/browser/gtk/accelerators_gtk.cc @@ -8,7 +8,7 @@ #include <gdk/gdkkeysyms.h> #include <X11/XF86keysym.h> -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" namespace { diff --git a/chrome/browser/gtk/back_forward_button_gtk.cc b/chrome/browser/gtk/back_forward_button_gtk.cc index b55b587..29d6ddd 100644 --- a/chrome/browser/gtk/back_forward_button_gtk.cc +++ b/chrome/browser/gtk/back_forward_button_gtk.cc @@ -8,7 +8,7 @@ #include "app/l10n_util.h" #include "base/message_loop.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/back_forward_menu_model.h" #include "chrome/browser/browser.h" #include "chrome/browser/gtk/gtk_theme_provider.h" diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc index 5ee8e85..dea24e6 100644 --- a/chrome/browser/gtk/browser_titlebar.cc +++ b/chrome/browser/gtk/browser_titlebar.cc @@ -17,7 +17,7 @@ #include "base/string_piece.h" #include "base/string_tokenizer.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/encoding_menu_controller.h" #include "chrome/browser/gtk/accelerators_gtk.h" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index a710bdc..09fb457 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -17,7 +17,7 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/singleton.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/gtk/accelerators_gtk.h" diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index dece395..6d537c9 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -20,7 +20,7 @@ #include "base/string_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index 325ff7b..b207665 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -14,7 +14,7 @@ #include "base/logging.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/accessibility_events.h" #include "chrome/browser/alternate_nav_url_fetcher.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h" diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index ac15365..86a1ba1 100644 --- a/chrome/browser/gtk/menu_gtk.cc +++ b/chrome/browser/gtk/menu_gtk.cc @@ -14,7 +14,7 @@ #include "base/message_loop.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/gtk/gtk_custom_menu.h" #include "chrome/browser/gtk/gtk_custom_menu_item.h" #include "chrome/browser/gtk/gtk_util.h" diff --git a/chrome/browser/gtk/reload_button_gtk.cc b/chrome/browser/gtk/reload_button_gtk.cc index 9afe61f..70ae71e 100644 --- a/chrome/browser/gtk/reload_button_gtk.cc +++ b/chrome/browser/gtk/reload_button_gtk.cc @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "base/logging.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/gtk/gtk_chrome_button.h" #include "chrome/browser/gtk/gtk_theme_provider.h" diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc index f07b723..b59fa84 100644 --- a/chrome/browser/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_gtk.cc @@ -10,7 +10,7 @@ #include "app/menus/accelerator_gtk.h" #include "base/singleton.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/gtk/accelerators_gtk.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/tab_menu_model.h" diff --git a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc index 82d052e..a766f3c 100644 --- a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc +++ b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc @@ -14,7 +14,7 @@ #include "base/string_util.h" #include "base/third_party/icu/icu_utf.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/gtk/gtk_util.h" #if !defined(TOOLKIT_VIEWS) #include "chrome/browser/gtk/menu_gtk.h" diff --git a/chrome/browser/repost_form_warning_uitest.cc b/chrome/browser/repost_form_warning_uitest.cc index c6e9514..a80ac97 100644 --- a/chrome/browser/repost_form_warning_uitest.cc +++ b/chrome/browser/repost_form_warning_uitest.cc @@ -4,7 +4,7 @@ #include <string> -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index b91ae93..051ecf7 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -6,7 +6,7 @@ #include "base/file_path.h" #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/defaults.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index c7dae91..dc9c522 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -4,7 +4,7 @@ #include "base/stringprintf.h" #include "base/time.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/prefs/pref_service.h" diff --git a/chrome/browser/sync/sync_ui_util_mac_unittest.mm b/chrome/browser/sync/sync_ui_util_mac_unittest.mm index 14208c7..96f72e7 100644 --- a/chrome/browser/sync/sync_ui_util_mac_unittest.mm +++ b/chrome/browser/sync/sync_ui_util_mac_unittest.mm @@ -8,7 +8,7 @@ #include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/cocoa/cocoa_test_helper.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 20eb116..989c6c9 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -14,7 +14,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/time.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_match.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_gtk.cc b/chrome/browser/tab_contents/render_view_context_menu_gtk.cc index 28d2fd8..120ea9e 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_gtk.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_gtk.cc @@ -7,7 +7,7 @@ #include <gtk/gtk.h> #include "base/string_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "webkit/glue/context_menu.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_mac.mm b/chrome/browser/tab_contents/render_view_context_menu_mac.mm index 1e4e4c4..2b9ca36 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_mac.mm +++ b/chrome/browser/tab_contents/render_view_context_menu_mac.mm @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "base/scoped_nsobject.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/menu_controller.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/tab_contents/view_source_uitest.cc b/chrome/browser/tab_contents/view_source_uitest.cc index 654b747..3e22b70 100644 --- a/chrome/browser/tab_contents/view_source_uitest.cc +++ b/chrome/browser/tab_contents/view_source_uitest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/url_constants.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 5764dde..eba8f50 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -5,7 +5,7 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/file_path.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index 90aef288..0c3d5d8 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -15,7 +15,7 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/thread.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_child_process_host.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc index bb5b157..975140e 100644 --- a/chrome/browser/translate/options_menu_model.cc +++ b/chrome/browser/translate/options_menu_model.cc @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "base/metrics/histogram.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/translate/translate_manager_unittest.cc b/chrome/browser/translate/translate_manager_unittest.cc index f578b3f..3055ed6 100644 --- a/chrome/browser/translate/translate_manager_unittest.cc +++ b/chrome/browser/translate/translate_manager_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/renderer_host/mock_render_process_host.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 52d3e5e..b1bdddf 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -24,7 +24,7 @@ #include "base/thread_restrictions.h" #include "base/utf_string_conversions.h" #include "gfx/point.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autofill/autofill_manager.h" #if defined(OS_WIN) #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc index a23b122..b8d9f86 100644 --- a/chrome/browser/views/about_ipc_dialog.cc +++ b/chrome/browser/views/about_ipc_dialog.cc @@ -19,7 +19,7 @@ #include "base/thread.h" #include "base/time.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_process.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/devtools_messages.h" diff --git a/chrome/browser/views/accelerator_table_gtk.cc b/chrome/browser/views/accelerator_table_gtk.cc index 5cea792..261420e 100644 --- a/chrome/browser/views/accelerator_table_gtk.cc +++ b/chrome/browser/views/accelerator_table_gtk.cc @@ -6,7 +6,7 @@ #include "app/keyboard_codes.h" #include "base/basictypes.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" namespace browser { diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 993c720..a1f651b 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -9,7 +9,7 @@ #include "app/resource_bundle.h" #include "base/string16.h" #include "base/string_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc index 831e5470..7fa1dc6 100644 --- a/chrome/browser/views/constrained_window_win.cc +++ b/chrome/browser/views/constrained_window_win.cc @@ -6,7 +6,7 @@ #include "app/resource_bundle.h" #include "app/win_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" diff --git a/chrome/browser/views/find_bar_host_uitest.cc b/chrome/browser/views/find_bar_host_uitest.cc index df4ea0e..8dd6dbb 100644 --- a/chrome/browser/views/find_bar_host_uitest.cc +++ b/chrome/browser/views/find_bar_host_uitest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 1baccf4..949b73b 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -14,6 +14,7 @@ #include "base/i18n/rtl.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index b532273..a326053 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -6,7 +6,7 @@ #include "app/resource_bundle.h" #include "app/theme_provider.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/side_tab_strip.h" diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc index 4777f51..635e9d2 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/views/fullscreen_exit_bubble.cc @@ -7,7 +7,7 @@ #include "app/keyboard_codes.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" #include "views/screen.h" diff --git a/chrome/browser/views/location_bar/keyword_hint_view.cc b/chrome/browser/views/location_bar/keyword_hint_view.cc index 14974c8..eec0dd1 100644 --- a/chrome/browser/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/views/location_bar/keyword_hint_view.cc @@ -7,7 +7,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "gfx/canvas.h" diff --git a/chrome/browser/views/location_bar/location_bar_view.cc b/chrome/browser/views/location_bar/location_bar_view.cc index 7aaf279..09c18a9 100644 --- a/chrome/browser/views/location_bar/location_bar_view.cc +++ b/chrome/browser/views/location_bar/location_bar_view.cc @@ -14,7 +14,7 @@ #include "app/theme_provider.h" #include "base/stl_util-inl.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" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/views/location_bar/star_view.cc b/chrome/browser/views/location_bar/star_view.cc index 88360ec..7d22441 100644 --- a/chrome/browser/views/location_bar/star_view.cc +++ b/chrome/browser/views/location_bar/star_view.cc @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/view_ids.h" #include "chrome/browser/views/browser_dialogs.h" diff --git a/chrome/browser/views/reload_button.cc b/chrome/browser/views/reload_button.cc index 180088e..43015e7 100644 --- a/chrome/browser/views/reload_button.cc +++ b/chrome/browser/views/reload_button.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/reload_button.h" #include "app/l10n_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/location_bar/location_bar_view.h" diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc index 8efb30b..e7ac1a6 100644 --- a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc +++ b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc @@ -6,7 +6,7 @@ #include "app/keyboard_codes.h" #include "base/compiler_specific.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profile.h" #include "grit/generated_resources.h" #include "views/accelerator.h" diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index db8a8e8..547b039 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -13,7 +13,7 @@ #include "app/theme_provider.h" #include "base/file_util.h" #include "base/logging.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "gfx/canvas.h" #include "gfx/favicon_size.h" diff --git a/chrome/browser/views/tabs/tab_dragging_test.cc b/chrome/browser/views/tabs/tab_dragging_test.cc index 2c41f5b..2cb0171 100644 --- a/chrome/browser/views/tabs/tab_dragging_test.cc +++ b/chrome/browser/views/tabs/tab_dragging_test.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "base/file_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/view_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/views/task_manager_view.cc b/chrome/browser/views/task_manager_view.cc index a4d74c2..f8432d4 100644 --- a/chrome/browser/views/task_manager_view.cc +++ b/chrome/browser/views/task_manager_view.cc @@ -9,7 +9,7 @@ #include "base/command_line.h" #include "base/metrics/stats_table.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_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index f026d03..cc82cdcd 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -6,7 +6,7 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/accessibility/browser_accessibility_state.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_window.h" diff --git a/chrome/browser/views/wrench_menu.cc b/chrome/browser/views/wrench_menu.cc index 0c51c68..4ad20f0 100644 --- a/chrome/browser/views/wrench_menu.cc +++ b/chrome/browser/views/wrench_menu.cc @@ -10,7 +10,7 @@ #include "app/resource_bundle.h" #include "base/string_number_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/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc index 9492557..cb7bace 100644 --- a/chrome/browser/wrench_menu_model.cc +++ b/chrome/browser/wrench_menu_model.cc @@ -14,7 +14,7 @@ #include "base/string_number_conversions.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/browser.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" diff --git a/chrome/browser/wrench_menu_model_unittest.cc b/chrome/browser/wrench_menu_model_unittest.cc index c539cee..188abf4 100644 --- a/chrome/browser/wrench_menu_model_unittest.cc +++ b/chrome/browser/wrench_menu_model_unittest.cc @@ -4,7 +4,7 @@ #include "chrome/browser/wrench_menu_model.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/test/browser_with_test_window_test.h" #include "chrome/test/menu_model_test.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index 6149a39..2ee9452 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -90,6 +90,7 @@ '../gears/gears.gyp:gears', ], 'sources': [ + 'app/chrome_command_ids.h', 'app/chrome_dll.rc', 'app/chrome_dll_main.cc', 'app/chrome_dll_resource.h', @@ -170,6 +171,7 @@ 'ORDER_FILE': 'app/framework.order', }, 'sources': [ + 'app/chrome_command_ids.h', 'app/chrome_dll_app_mode_mac.mm', 'app/chrome_dll_main.cc', 'app/chrome_dll_resource.h', @@ -567,6 +569,7 @@ '<@(nacl_win64_defines)', ], 'sources': [ + 'app/chrome_command_ids.h', 'app/chrome_dll_main.cc', 'app/chrome_dll_resource.h', 'browser/renderer_host/render_process_host_dummy.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index f003777..646a002 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -5,6 +5,7 @@ { 'variables' : { 'pyautolib_sources': [ + 'app/chrome_command_ids.h', 'app/chrome_dll_resource.h', 'common/pref_names.cc', 'common/pref_names.h', @@ -1880,6 +1881,7 @@ 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], 'sources': [ 'app/breakpad_mac_stubs.mm', + 'app/chrome_command_ids.h', 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_dll_version.rc.version', @@ -2123,6 +2125,7 @@ } }, { # else: OS != "win" 'sources!': [ + 'app/chrome_command_ids.h', 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_dll_version.rc.version', @@ -2680,6 +2683,7 @@ # TODO(phajdan.jr): Only temporary, to make transition easier. 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], 'sources': [ + 'app/chrome_command_ids.h', 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', 'app/chrome_dll_version.rc.version', diff --git a/chrome/renderer/external_extension_uitest.cc b/chrome/renderer/external_extension_uitest.cc index 3df6af4..46af769 100644 --- a/chrome/renderer/external_extension_uitest.cc +++ b/chrome/renderer/external_extension_uitest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc index c629ed0..04c75da 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/view_ids.h" #include "chrome/test/automated_ui_tests/automated_ui_test_base.h" #include "chrome/test/automation/browser_proxy.h" diff --git a/chrome/test/automated_ui_tests/automated_ui_test_test.cc b/chrome/test/automated_ui_tests/automated_ui_test_test.cc index 5096f0f..75cfe5a 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_test.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_test.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/url_constants.h" #include "chrome/test/automated_ui_tests/automated_ui_test_base.h" #include "chrome/test/automation/browser_proxy.h" diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc index 2c7dd1b..2c6cc35 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.cc +++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc @@ -17,7 +17,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/view_ids.h" diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h index 487d53c..89aba25 100644 --- a/chrome/test/automation/automation_messages_internal.h +++ b/chrome/test/automation/automation_messages_internal.h @@ -225,7 +225,7 @@ IPC_BEGIN_MESSAGES(Automation) int) // accelerator id like (IDC_BACK, // IDC_FORWARD, etc) // The list can be found at - // chrome/app/chrome_dll_resource.h + // chrome/app/chrome_command_ids.h // This message requests that the AutomationProvider executes a JavaScript, // which is sent embedded in a 'javascript:' URL. diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index 654c10d..513e83d 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -15,7 +15,7 @@ #include "base/sys_info.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_request_slow_http_job.h" #include "chrome/browser/view_ids.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/test/automation/browser_proxy.h b/chrome/test/automation/browser_proxy.h index 3fb06d4..17973a6 100644 --- a/chrome/test/automation/browser_proxy.h +++ b/chrome/test/automation/browser_proxy.h @@ -95,7 +95,7 @@ class BrowserProxy : public AutomationResourceProxy { scoped_refptr<AutocompleteEditProxy> GetAutocompleteEdit(); // Apply the accelerator with given id (IDC_BACK, IDC_NEWTAB ...) - // The list can be found at chrome/app/chrome_dll_resource.h + // The list can be found at chrome/app/chrome_command_ids.h // Returns true if the call was successful. // // The alternate way to test the accelerators is to use the Windows messaging diff --git a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc index 98871b6..e9423ef 100644 --- a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc +++ b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc @@ -4,7 +4,7 @@ #include "app/message_box_flags.h" #include "base/file_path.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/view_ids.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" diff --git a/chrome/test/pyautolib/pyautolib.h b/chrome/test/pyautolib/pyautolib.h index 00f1c28..a12ca8f 100644 --- a/chrome/test/pyautolib/pyautolib.h +++ b/chrome/test/pyautolib/pyautolib.h @@ -76,7 +76,7 @@ class PyUITestBase : public UITestBase { // Apply the accelerator with given id (IDC_BACK, IDC_NEWTAB ...) to the // browser window at the given or first index. - // The list can be found at chrome/app/chrome_dll_resource.h + // The list can be found at chrome/app/chrome_command_ids.h // Returns true if the call was successful. bool ApplyAccelerator(int id, int window_index = 0); diff --git a/chrome/test/startup/feature_startup_test.cc b/chrome/test/startup/feature_startup_test.cc index e89c8d6..aec3eab 100644 --- a/chrome/test/startup/feature_startup_test.cc +++ b/chrome/test/startup/feature_startup_test.cc @@ -7,7 +7,7 @@ #include "base/perftimer.h" #include "base/string_util.h" #include "base/time.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/browser_proxy.h" diff --git a/chrome/test/tab_switching/tab_switching_test.cc b/chrome/test/tab_switching/tab_switching_test.cc index 62eb88c..028642f 100644 --- a/chrome/test/tab_switching/tab_switching_test.cc +++ b/chrome/test/tab_switching/tab_switching_test.cc @@ -11,7 +11,7 @@ #include "base/scoped_ptr.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" diff --git a/chrome/test/ui/omnibox_uitest.cc b/chrome/test/ui/omnibox_uitest.cc index 8dc56fc..86016bde 100644 --- a/chrome/test/ui/omnibox_uitest.cc +++ b/chrome/test/ui/omnibox_uitest.cc @@ -11,7 +11,7 @@ #include "base/perftimer.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/common/chrome_paths.h" #include "chrome/common/libxml_utils.h" #include "chrome/test/automation/autocomplete_edit_proxy.h" diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 8c72435..b7a7c5a 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -28,7 +28,7 @@ #include "base/test/test_file_util.h" #include "base/time.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/test/webdriver/commands/create_session.cc b/chrome/test/webdriver/commands/create_session.cc index 6903efb..30c71c7 100644 --- a/chrome/test/webdriver/commands/create_session.cc +++ b/chrome/test/webdriver/commands/create_session.cc @@ -8,7 +8,7 @@ #include <string> #include "base/values.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/test/webdriver/commands/session_with_id.cc b/chrome/test/webdriver/commands/session_with_id.cc index 43000e7..e2dcced 100644 --- a/chrome/test/webdriver/commands/session_with_id.cc +++ b/chrome/test/webdriver/commands/session_with_id.cc @@ -8,7 +8,7 @@ #include <string> #include "base/values.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/test/webdriver/commands/webdriver_command.cc b/chrome/test/webdriver/commands/webdriver_command.cc index d7e9ab0..da1b601 100644 --- a/chrome/test/webdriver/commands/webdriver_command.cc +++ b/chrome/test/webdriver/commands/webdriver_command.cc @@ -12,7 +12,7 @@ #include "base/values.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/automation_proxy.h" diff --git a/chrome/test/webdriver/session.cc b/chrome/test/webdriver/session.cc index 218c7f1..fadc41e 100644 --- a/chrome/test/webdriver/session.cc +++ b/chrome/test/webdriver/session.cc @@ -31,7 +31,7 @@ #include "base/json/json_writer.h" #include "base/utf_string_conversions.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/test_launcher_utils.h" diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 4b34b7e..7831352 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -4,7 +4,7 @@ #include "base/file_path.h" #include "base/string_util.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/worker_host/worker_service.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index bd82315..871b8b9 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -30,7 +30,7 @@ #include "base/utf_string_conversions.h" #include "base/win/scoped_variant.h" #include "grit/generated_resources.h" -#include "chrome/app/chrome_dll_resource.h" +#include "chrome/app/chrome_command_ids.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/navigation_types.h" |