diff options
Diffstat (limited to 'chrome')
91 files changed, 296 insertions, 351 deletions
diff --git a/chrome/app/chrome_strings.scons b/chrome/app/chrome_strings.scons index 580565f..2b5934e 100644 --- a/chrome/app/chrome_strings.scons +++ b/chrome/app/chrome_strings.scons @@ -12,6 +12,7 @@ grd_files = [ '$CHROME_SRC_DIR/chrome/app/generated_resources.grd', '$CHROME_SRC_DIR/chrome/app/chromium_strings.grd', '$CHROME_SRC_DIR/chrome/app/google_chrome_strings.grd', + '$CHROME_SRC_DIR/chrome/app/resources/locale_settings.grd', ] for grd_file in grd_files: @@ -20,3 +21,15 @@ for grd_file in grd_files: generated = env.GRIT( '$TARGET_ROOT/grit_derived_sources/fake_' + os.path.basename(grd_file), grd_file) + +if env.Bit('linux'): + # TODO(tc): Generate all the locales and handle official build vs chromium + # build. + lang_pak = env.Repack('$TARGET_ROOT/locales/en-US.pak', + ['$TARGET_ROOT/grit_derived_sources/generated_resources_en-US.pak', + '$TARGET_ROOT/grit_derived_sources/chromium_strings_en-US.pak', + '$TARGET_ROOT/grit_derived_sources/locale_settings_en-US.pak', + ] + ) + i = env.Install('$DESTINATION_ROOT/locales', lang_pak) + env.Requires('$DESTINATION_ROOT/chrome', i) diff --git a/chrome/app/chrome_strings.vcproj b/chrome/app/chrome_strings.vcproj index 165e2ea..a4d063b 100644 --- a/chrome/app/chrome_strings.vcproj +++ b/chrome/app/chrome_strings.vcproj @@ -64,5 +64,13 @@ RelativePath="$(IntDir)\google_chrome_strings.h" > </File> + <File + RelativePath=".\resources\locale_settings.grd" + > + </File> + <File + RelativePath="$(IntDir)\locale_settings.h" + > + </File> </Files> </VisualStudioProject> diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd index 981517e..aad04c6 100644 --- a/chrome/app/chromium_strings.grd +++ b/chrome/app/chromium_strings.grd @@ -60,6 +60,8 @@ be available for now. --> <output filename="chromium_strings_vi.rc" type="rc_all" lang="vi" /> <output filename="chromium_strings_zh-CN.rc" type="rc_all" lang="zh-CN" /> <output filename="chromium_strings_zh-TW.rc" type="rc_all" lang="zh-TW" /> + + <output filename="chromium_strings_en-US.pak" type="data_package" lang="en" /> </outputs> <translations> <!-- No translations available. --> diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 6a8669d..601fdc6 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -61,6 +61,8 @@ each locale. --> <output filename="generated_resources_vi.rc" type="rc_all" lang="vi" /> <output filename="generated_resources_zh-CN.rc" type="rc_all" lang="zh-CN" /> <output filename="generated_resources_zh-TW.rc" type="rc_all" lang="zh-TW" /> + + <output filename="generated_resources_en-US.pak" type="data_package" lang="en" /> </outputs> <translations> <file path="resources/generated_resources_ar.xtb" lang="ar" /> diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd index a8e7235..6d71ed7 100644 --- a/chrome/app/google_chrome_strings.grd +++ b/chrome/app/google_chrome_strings.grd @@ -60,6 +60,8 @@ Chrome supports. --> <output filename="google_chrome_strings_vi.rc" type="rc_all" lang="vi" /> <output filename="google_chrome_strings_zh-CN.rc" type="rc_all" lang="zh-CN" /> <output filename="google_chrome_strings_zh-TW.rc" type="rc_all" lang="zh-TW" /> + + <output filename="google_chrome_strings_en-US.pak" type="data_package" lang="en" /> </outputs> <translations> <file path="resources/google_chrome_strings_ar.xtb" lang="ar" /> diff --git a/chrome/app/locales/locale_settings.h b/chrome/app/locales/locale_settings.h deleted file mode 100644 index 9b2034b..0000000 --- a/chrome/app/locales/locale_settings.h +++ /dev/null @@ -1,181 +0,0 @@ -// These are the identifiers for locale specific settings. - -// UNUSED 1000 - -// The font used in web-style native pages (e.g. History). -#define IDS_WEB_FONT_FAMILY 1001 - -// The default value for HTTP Accept-Language header. -#define IDS_ACCEPT_LANGUAGES 1002 - -// Default values for the WebPreference object. -// The default value for |WebPreference::default_encoding|. -#define IDS_DEFAULT_ENCODING 1003 -// The default value to determine whether |WebPreference::standard_font_family| -// serif or sans-serif -#define IDS_STANDARD_FONT_IS_SERIF 1004 -// The default value for |WebPreference::fixed_font_family| -#define IDS_FIXED_FONT_FAMILY 1005 -// The default value for |WebPreference::serif_font_family| -#define IDS_SERIF_FONT_FAMILY 1006 -// The default value for |WebPreference::sans_serif_font_family| -#define IDS_SANS_SERIF_FONT_FAMILY 1007 -// The default value for |WebPreference::cursive_font_family| -#define IDS_CURSIVE_FONT_FAMILY 1008 -// The default value for |WebPreference::fantasy_font_family| -#define IDS_FANTASY_FONT_FAMILY 1009 -// The default value for |WebPreference::default_font_size| -#define IDS_DEFAULT_FONT_SIZE 1010 -// The default value for |WebPreference::default_fixed_font_size| -#define IDS_DEFAULT_FIXED_FONT_SIZE 1011 -// The default value for |WebPreference::minimum_font_size| -#define IDS_MINIMUM_FONT_SIZE 1012 -// The default value for |WebPreference::minimum_logical_font_size|. -#define IDS_MINIMUM_LOGICAL_FONT_SIZE 1013 -// The default value for |WebPreference::uses_universal_detector|. -#define IDS_USES_UNIVERSAL_DETECTOR 1014 - - -// The file name of the spellchecking dictionary without the extension (case-sensitive). -#define IDS_SPELLCHECK_DICTIONARY 1015 - -// URL for the "Learn more" link on the malware blocking page. -#define IDS_LEARN_MORE_MALWARE_URL 1016 - -// URL for the "Learn more" link on the phishing blocking page. -#define IDS_LEARN_MORE_PHISHING_URL 1017 - -// Removed: #define IDS_REPORT_ERROR_PHISHING_URL 1018 - -// Removed: #define IDS_PAGE_MENU_REPORT_PHISHING_WEBSITE_URL 1019 - -// The width of the Options dialog box, in characters (character width = -// average character width for default dialog box font) -#define IDS_OPTIONS_DIALOG_WIDTH_CHARS 1020 - -// The height of the Options dialog box, in lines (line height = character -// height for default dialog box font) -#define IDS_OPTIONS_DIALOG_HEIGHT_LINES 1021 - -// The width of the title column of the Options dialog box, in characters (see -// above for defn of character width) -#define IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS 1022 - -// The URL to be loaded to display Help -#define IDS_HELP_CONTENT_URL 1023 - -// URL to post bug reports to -#define IDS_BUGREPORT_POST_URL 1024 - -// The width and height of the Bug Reporting dialog box in characters and lines -// (See above). -#define IDS_BUGREPORT_DIALOG_WIDTH_CHARS 1025 -#define IDS_BUGREPORT_DIALOG_HEIGHT_LINES 1026 - -// The width and height of the Clear Browsing Data dialog box in characters and -// lines (See above). -#define IDS_CLEARDATA_DIALOG_WIDTH_CHARS 1027 -#define IDS_CLEARDATA_DIALOG_HEIGHT_LINES 1028 - -// The width and height of the Import dialog box in characters and lines (See -// above). -#define IDS_IMPORT_DIALOG_WIDTH_CHARS 1029 -#define IDS_IMPORT_DIALOG_HEIGHT_LINES 1030 - -// The width and height of the About dialog box in characters and lines (See -// above). -#define IDS_ABOUT_DIALOG_WIDTH_CHARS 1031 -#define IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES 1032 - -// The width and height of the Fonts and Languages dialog box in characters and -// lines (See above). -#define IDS_FONTSLANG_DIALOG_WIDTH_CHARS 1033 -#define IDS_FONTSLANG_DIALOG_HEIGHT_LINES 1034 - -// Locale-dependent static encodings string -#define IDS_STATIC_ENCODING_LIST 1035 - -// The width and height of the Page Info dialog box in characters and lines -// (See above). -#define IDS_PAGEINFO_DIALOG_WIDTH_CHARS 1036 -#define IDS_PAGEINFO_DIALOG_HEIGHT_LINES 1037 - -// The width and height of the Search Engines dialog box in characters and -// lines (See above). -#define IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS 1038 -#define IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES 1039 - -// The width and height of the Shelf Item dialog box in characters and -// lines (See above). -#define IDS_SHELFITEM_DIALOG_WIDTH_CHARS 1040 -#define IDS_SHELFITEM_DIALOG_HEIGHT_LINES 1041 - -// The width and height of the Edit Bookmark dialog box in characters and lines -// (See above). -#define IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS 1042 -#define IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES 1043 - -// The width and height of the First Run dialog box in characters and lines -// (See above). -#define IDS_FIRSTRUN_DIALOG_WIDTH_CHARS 1044 -#define IDS_FIRSTRUN_DIALOG_HEIGHT_LINES 1045 - -// The width and height of the First Run Customize dialog box in characters and -// lines (See above). -#define IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS 1046 -#define IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES 1047 - -// The width and height of the Cookies dialog box in characters and lines -// (See above). -#define IDS_COOKIES_DIALOG_WIDTH_CHARS 1048 -#define IDS_COOKIES_DIALOG_HEIGHT_LINES 1049 - -// The width and height of the Import Progress dialog box in characters and -// lines (See above). -#define IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS 1050 -#define IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES 1051 - -// The width and height of the "Mozilla Firefox is locked" dialog box in -// characters and lines (See above). -#define IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS 1052 -#define IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES 1053 - -// The width and height of the First Run Search Information bubble in -// characters and lines (See above). -#define IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS 1054 -#define IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES 1055 - -// The width of the font style column in the Fonts and Languages dialog box, -// in character widths. -#define IDS_FONTSLANG_LABEL_WIDTH 1056 - -// The URL for the the Welcome to Chrome page shown on first run. -#define IDS_WELCOME_PAGE_URL 1057 - -// The URL for the the Learn More page shown on incognito new tab. -#define IDS_LEARN_MORE_INCOGNITO_URL 1058 - -// The URL for the "Learn more" page for the Privacy section under Options. -#define IDS_LEARN_MORE_PRIVACY_URL 1059 - -// The URL for more info on how we are affected by 3rd party licenses. -#define IDS_ABOUT_VERSION_LICENSE_URL 1060 - -// The HTML for the about:terms page -#define IDR_TERMS_HTML 1061 - -// The width and height of the bookmark manager in characters and lines -// (See above). -#define IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS 1062 -#define IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES 1063 - -// The language dependent download view size. -#define IDS_DOWNLOAD_BIG_PROGRESS_SIZE 1064 - -// The width and height of the Select Profile dialog in characters and lines -// (See above). -#define IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS 1065 -#define IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES 1066 - -// The width of the New Profile dialog in characters (See above). -#define IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS 1067 diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd index 2838285..15735db 100755 --- a/chrome/app/resources/locale_settings.grd +++ b/chrome/app/resources/locale_settings.grd @@ -61,6 +61,7 @@ </outputs> <release seq="1" allow_pseudo="false"> <includes> + <!-- The HTML for the about:terms page --> <if expr="pp_ifdef('_google_chrome')"> <!-- TODO(tc): This won't work yet since we don't substitute GRITLANGCODE in random attributes. --> @@ -71,192 +72,306 @@ </if> </includes> <messages fallback_to_english="true"> + + <!-- The font used in web-style native pages (e.g. History). --> <message name="IDS_WEB_FONT_FAMILY"> Arial </message> + + <!-- The default value for HTTP Accept-Language header. --> <message name="IDS_ACCEPT_LANGUAGES"> en-US,en </message> + + <!-- The default value for |WebPreference::default_encoding|. --> <message name="IDS_DEFAULT_ENCODING"> ISO-8859-1 </message> + + <!-- The default value to determine whether + |WebPreference::standard_font_family| serif or sans-serif --> <message name="IDS_STANDARD_FONT_IS_SERIF"> true </message> + + <!-- The default value for |WebPreference::fixed_font_family| --> <message name="IDS_FIXED_FONT_FAMILY"> Courier New </message> + + <!-- The default value for |WebPreference::serif_font_family| --> <message name="IDS_SERIF_FONT_FAMILY"> Times New Roman </message> + + <!-- The default value for |WebPreference::sans_serif_font_family| --> <message name="IDS_SANS_SERIF_FONT_FAMILY"> Arial </message> + + <!-- The default value for |WebPreference::cursive_font_family| --> <message name="IDS_CURSIVE_FONT_FAMILY"> Comic Sans MS </message> + + <!-- The default value for |WebPreference::fantasy_font_family| --> <message name="IDS_FANTASY_FONT_FAMILY"> Impact </message> + + <!-- The default value for |WebPreference::default_font_size| --> <message name="IDS_DEFAULT_FONT_SIZE"> 16 </message> + + <!-- The default value for |WebPreference::default_fixed_font_size| --> <message name="IDS_DEFAULT_FIXED_FONT_SIZE"> 13 </message> + + <!-- The default value for |WebPreference::minimum_font_size| --> <message name="IDS_MINIMUM_FONT_SIZE"> 1 </message> + + <!-- The default value for |WebPreference::minimum_logical_font_size|. --> <message name="IDS_MINIMUM_LOGICAL_FONT_SIZE"> 6 </message> + + <!-- The default value for |WebPreference::uses_universal_detector|. --> <message name="IDS_USES_UNIVERSAL_DETECTOR"> false </message> + + <!-- The file name of the spellchecking dictionary without the extension (case-sensitive). --> <message name="IDS_SPELLCHECK_DICTIONARY"> en-US </message> + + <!-- URL for the "Learn more" link on the malware blocking page. --> <message name="IDS_LEARN_MORE_MALWARE_URL"> http://www.google.com/support/bin/answer.py?answer=45449&topic=360&hl=en&sa=X&oi=malwarewarninglink&resnum=1&ct=help </message> + + <!-- URL for the "Learn more" link on the phishing blocking page. --> <message name="IDS_LEARN_MORE_PHISHING_URL"> http://www.google.com/support/bin/answer.py?answer=106318&hl=[GRITLANGCODE] </message> + + <!-- The width of the Options dialog box, in characters (character width = --> + <!-- average character width for default dialog box font) --> <message name="IDS_OPTIONS_DIALOG_WIDTH_CHARS"> 98 </message> + + <!-- The height of the Options dialog box, in lines (line height = character --> + <!-- height for default dialog box font) --> <message name="IDS_OPTIONS_DIALOG_HEIGHT_LINES"> 36 </message> + + <!-- The width of the title column of the Options dialog box, in characters (see --> + <!-- above for defn of character width) --> <message name="IDS_OPTIONS_DIALOG_LEFT_COLUMN_WIDTH_CHARS"> 23 </message> + + <!-- The width and height of the Bug Reporting dialog box in characters and lines --> + <!-- (See above). --> <message name="IDS_BUGREPORT_DIALOG_WIDTH_CHARS"> 85 </message> <message name="IDS_BUGREPORT_DIALOG_HEIGHT_LINES"> 17 </message> + + <!-- The width and height of the Clear Browsing Data dialog box in characters and --> + <!-- lines (See above). --> <message name="IDS_CLEARDATA_DIALOG_WIDTH_CHARS"> 63 </message> <message name="IDS_CLEARDATA_DIALOG_HEIGHT_LINES"> 15.5 </message> + + <!-- The width and height of the Import dialog box in characters and lines (See --> + <!-- above). --> <message name="IDS_IMPORT_DIALOG_WIDTH_CHARS"> 60 </message> <message name="IDS_IMPORT_DIALOG_HEIGHT_LINES"> 14 </message> + + <!-- The width and height of the About dialog box in characters and lines (See --> + <!-- above). --> <message name="IDS_ABOUT_DIALOG_WIDTH_CHARS"> 70 </message> <message name="IDS_ABOUT_DIALOG_MINIMUM_HEIGHT_LINES"> 4 </message> + + <!-- The width and height of the Fonts and Languages dialog box in characters and --> + <!-- lines (See above). --> <message name="IDS_FONTSLANG_DIALOG_WIDTH_CHARS"> 96 </message> <message name="IDS_FONTSLANG_DIALOG_HEIGHT_LINES"> 26 </message> + + <!-- The width of the font style column in the Fonts and Languages dialog box, --> + <!-- in character widths. --> <message name="IDS_FONTSLANG_LABEL_WIDTH"> 18 </message> + + <!-- The width and height of the Page Info dialog box in characters and lines --> + <!-- (See above). --> <message name="IDS_PAGEINFO_DIALOG_WIDTH_CHARS"> 70 </message> <message name="IDS_PAGEINFO_DIALOG_HEIGHT_LINES"> 25 </message> + + <!-- The width and height of the Search Engines dialog box in characters and --> + <!-- lines (See above). --> <message name="IDS_SEARCHENGINES_DIALOG_WIDTH_CHARS"> 95 </message> <message name="IDS_SEARCHENGINES_DIALOG_HEIGHT_LINES"> 25 </message> + + <!-- The width and height of the Shelf Item dialog box in characters and --> + <!-- lines (See above). --> <message name="IDS_SHELFITEM_DIALOG_WIDTH_CHARS"> 80 </message> <message name="IDS_SHELFITEM_DIALOG_HEIGHT_LINES"> 30 </message> + + <!-- The width and height of the Edit Bookmark dialog box in characters and lines --> + <!-- (See above). --> <message name="IDS_EDITBOOKMARK_DIALOG_WIDTH_CHARS"> 70 </message> <message name="IDS_EDITBOOKMARK_DIALOG_HEIGHT_LINES"> 25 </message> + + <!-- The width and height of the First Run dialog box in characters and lines --> + <!-- (See above). --> <message name="IDS_FIRSTRUN_DIALOG_WIDTH_CHARS"> 90 </message> <message name="IDS_FIRSTRUN_DIALOG_HEIGHT_LINES"> 16 </message> + + <!-- The width and height of the First Run Customize dialog box in characters and --> + <!-- lines (See above). --> <message name="IDS_FIRSTRUNCUSTOMIZE_DIALOG_WIDTH_CHARS"> 90 </message> <message name="IDS_FIRSTRUNCUSTOMIZE_DIALOG_HEIGHT_LINES"> 17 </message> + + <!-- The width and height of the Cookies dialog box in characters and lines --> + <!-- (See above). --> <message name="IDS_COOKIES_DIALOG_WIDTH_CHARS"> 80 </message> <message name="IDS_COOKIES_DIALOG_HEIGHT_LINES"> 29 </message> + + <!-- The width and height of the Import Progress dialog box in characters and --> + <!-- lines (See above). --> <message name="IDS_IMPORTPROGRESS_DIALOG_WIDTH_CHARS"> 75 </message> <message name="IDS_IMPORTPROGRESS_DIALOG_HEIGHT_LINES"> 16 </message> + + <!-- The width and height of the "Mozilla Firefox is locked" dialog box in --> + <!-- characters and lines (See above). --> <message name="IDS_IMPORTLOCK_DIALOG_WIDTH_CHARS"> 50 </message> <message name="IDS_IMPORTLOCK_DIALOG_HEIGHT_LINES"> 8 </message> + + <!-- The width and height of the First Run Search Information bubble in --> + <!-- characters and lines (See above). --> <message name="IDS_FIRSTRUNBUBBLE_DIALOG_WIDTH_CHARS"> 93 </message> <message name="IDS_FIRSTRUNBUBBLE_DIALOG_HEIGHT_LINES"> 12 </message> + + <!-- The URL to be loaded to display Help --> <message name="IDS_HELP_CONTENT_URL"> http://www.google.com/support/chrome/?hl=[GRITLANGCODE] </message> + + <!-- URL to post bug reports to --> <message name="IDS_BUGREPORT_POST_URL"> http://web-bug.appspot.com/bugreport </message> + + <!-- Locale-dependent static encodings string --> <message name="IDS_STATIC_ENCODING_LIST"> ISO-8859-1,windows-1252 </message> + + <!-- The URL for the the Welcome to Chrome page shown on first run. --> <message name="IDS_WELCOME_PAGE_URL"> http://tools.google.com/chrome/intl/[GRITLANGCODE]/welcome.html </message> + + <!-- The URL for the the Learn More page shown on incognito new tab. --> <message name="IDS_LEARN_MORE_INCOGNITO_URL"> http://www.google.com/support/chrome/bin/answer.py?answer=95464&hl=[GRITLANGCODE] </message> + + <!-- The URL for the "Learn more" page for the Privacy section under Options. --> <message name="IDS_LEARN_MORE_PRIVACY_URL"> http://www.google.com/support/chrome/bin/answer.py?answer=114836&hl=[GRITLANGCODE] </message> + + <!-- The width and height of the bookmark manager in characters and lines --> + <!-- (See above). --> <message name="IDS_BOOKMARK_MANAGER_DIALOG_WIDTH_CHARS"> 150 </message> <message name="IDS_BOOKMARK_MANAGER_DIALOG_HEIGHT_LINES"> 40 </message> + + <!-- The language dependent download view size. --> <message name="IDS_DOWNLOAD_BIG_PROGRESS_SIZE"> 52 </message> + + <!-- The width and height of the Select Profile dialog in characters and lines --> + <!-- (See above). --> <message name="IDS_SELECT_PROFILE_DIALOG_WIDTH_CHARS"> 60 </message> <message name="IDS_SELECT_PROFILE_DIALOG_HEIGHT_LINES"> 5 </message> + + <!-- The width of the New Profile dialog in characters (See above). --> <message name="IDS_NEW_PROFILE_DIALOG_WIDTH_CHARS"> 60 </message> diff --git a/chrome/app/resources/locale_settings_ar.rc b/chrome/app/resources/locale_settings_ar.rc index dc61434..2238180 100644 --- a/chrome/app/resources/locale_settings_ar.rc +++ b/chrome/app/resources/locale_settings_ar.rc @@ -1,5 +1,5 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_bg.rc b/chrome/app/resources/locale_settings_bg.rc index c093093..e41e4a1 100644 --- a/chrome/app/resources/locale_settings_bg.rc +++ b/chrome/app/resources/locale_settings_bg.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_bn.rc b/chrome/app/resources/locale_settings_bn.rc index 1bc4e40..fe82944 100644 --- a/chrome/app/resources/locale_settings_bn.rc +++ b/chrome/app/resources/locale_settings_bn.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_ca.rc b/chrome/app/resources/locale_settings_ca.rc index 6fb2326..8472a2d 100644 --- a/chrome/app/resources/locale_settings_ca.rc +++ b/chrome/app/resources/locale_settings_ca.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_cs.rc b/chrome/app/resources/locale_settings_cs.rc index d1b9171..996c3ed 100644 --- a/chrome/app/resources/locale_settings_cs.rc +++ b/chrome/app/resources/locale_settings_cs.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_da.rc b/chrome/app/resources/locale_settings_da.rc index b0aeaf7..3437e76 100644 --- a/chrome/app/resources/locale_settings_da.rc +++ b/chrome/app/resources/locale_settings_da.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_de.rc b/chrome/app/resources/locale_settings_de.rc index 8af5098..2c1b4fb 100644 --- a/chrome/app/resources/locale_settings_de.rc +++ b/chrome/app/resources/locale_settings_de.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_el.rc b/chrome/app/resources/locale_settings_el.rc index ac6e19c..118ec26 100644 --- a/chrome/app/resources/locale_settings_el.rc +++ b/chrome/app/resources/locale_settings_el.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_en-GB.rc b/chrome/app/resources/locale_settings_en-GB.rc index d51190c..10d7d32 100644 --- a/chrome/app/resources/locale_settings_en-GB.rc +++ b/chrome/app/resources/locale_settings_en-GB.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_en-US.rc b/chrome/app/resources/locale_settings_en-US.rc index 1f1dd9a..fe659df 100644 --- a/chrome/app/resources/locale_settings_en-US.rc +++ b/chrome/app/resources/locale_settings_en-US.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_es-419.rc b/chrome/app/resources/locale_settings_es-419.rc index 0459357..7533fcf 100644 --- a/chrome/app/resources/locale_settings_es-419.rc +++ b/chrome/app/resources/locale_settings_es-419.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_es.rc b/chrome/app/resources/locale_settings_es.rc index e68846c..bfc1fbf 100644 --- a/chrome/app/resources/locale_settings_es.rc +++ b/chrome/app/resources/locale_settings_es.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_et.rc b/chrome/app/resources/locale_settings_et.rc index d126072..e088eb4 100644 --- a/chrome/app/resources/locale_settings_et.rc +++ b/chrome/app/resources/locale_settings_et.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_fi.rc b/chrome/app/resources/locale_settings_fi.rc index abbce0a..6e9c6e2 100644 --- a/chrome/app/resources/locale_settings_fi.rc +++ b/chrome/app/resources/locale_settings_fi.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_fil.rc b/chrome/app/resources/locale_settings_fil.rc index ab2b98b..91d8dd1 100644 --- a/chrome/app/resources/locale_settings_fil.rc +++ b/chrome/app/resources/locale_settings_fil.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_fr.rc b/chrome/app/resources/locale_settings_fr.rc index bdced46..dc44fac 100644 --- a/chrome/app/resources/locale_settings_fr.rc +++ b/chrome/app/resources/locale_settings_fr.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_gu.rc b/chrome/app/resources/locale_settings_gu.rc index 48e5185..73b09bc 100644 --- a/chrome/app/resources/locale_settings_gu.rc +++ b/chrome/app/resources/locale_settings_gu.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_he.rc b/chrome/app/resources/locale_settings_he.rc index aad2452..a629cdb 100644 --- a/chrome/app/resources/locale_settings_he.rc +++ b/chrome/app/resources/locale_settings_he.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_hi.rc b/chrome/app/resources/locale_settings_hi.rc index 0be80fe..b931769 100644 --- a/chrome/app/resources/locale_settings_hi.rc +++ b/chrome/app/resources/locale_settings_hi.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_hr.rc b/chrome/app/resources/locale_settings_hr.rc index a8cdca3..853a784 100644 --- a/chrome/app/resources/locale_settings_hr.rc +++ b/chrome/app/resources/locale_settings_hr.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_hu.rc b/chrome/app/resources/locale_settings_hu.rc index a1dde48..0e704b3 100644 --- a/chrome/app/resources/locale_settings_hu.rc +++ b/chrome/app/resources/locale_settings_hu.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_id.rc b/chrome/app/resources/locale_settings_id.rc index 0ce8b81..c3bde9a 100644 --- a/chrome/app/resources/locale_settings_id.rc +++ b/chrome/app/resources/locale_settings_id.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_it.rc b/chrome/app/resources/locale_settings_it.rc index 523a23b..4a4ea4f 100644 --- a/chrome/app/resources/locale_settings_it.rc +++ b/chrome/app/resources/locale_settings_it.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_ja.rc b/chrome/app/resources/locale_settings_ja.rc index 73ad374..ee47f55 100644 --- a/chrome/app/resources/locale_settings_ja.rc +++ b/chrome/app/resources/locale_settings_ja.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_kn.rc b/chrome/app/resources/locale_settings_kn.rc index e093bf6..25fdb6d 100644 --- a/chrome/app/resources/locale_settings_kn.rc +++ b/chrome/app/resources/locale_settings_kn.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_ko.rc b/chrome/app/resources/locale_settings_ko.rc index a94dafe..0acf661 100644 --- a/chrome/app/resources/locale_settings_ko.rc +++ b/chrome/app/resources/locale_settings_ko.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_lt.rc b/chrome/app/resources/locale_settings_lt.rc index dc791de..13a2519 100644 --- a/chrome/app/resources/locale_settings_lt.rc +++ b/chrome/app/resources/locale_settings_lt.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_lv.rc b/chrome/app/resources/locale_settings_lv.rc index 3e5fb28..541934e 100644 --- a/chrome/app/resources/locale_settings_lv.rc +++ b/chrome/app/resources/locale_settings_lv.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_ml.rc b/chrome/app/resources/locale_settings_ml.rc index 113ae36..33ef651 100644 --- a/chrome/app/resources/locale_settings_ml.rc +++ b/chrome/app/resources/locale_settings_ml.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_mr.rc b/chrome/app/resources/locale_settings_mr.rc index d52c2a11..c8c3028 100644 --- a/chrome/app/resources/locale_settings_mr.rc +++ b/chrome/app/resources/locale_settings_mr.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_nb.rc b/chrome/app/resources/locale_settings_nb.rc index 52fa17d..8028058 100644 --- a/chrome/app/resources/locale_settings_nb.rc +++ b/chrome/app/resources/locale_settings_nb.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_nl.rc b/chrome/app/resources/locale_settings_nl.rc index af5445c..066056c 100644 --- a/chrome/app/resources/locale_settings_nl.rc +++ b/chrome/app/resources/locale_settings_nl.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_or.rc b/chrome/app/resources/locale_settings_or.rc index 64cac00..9bcc065 100644 --- a/chrome/app/resources/locale_settings_or.rc +++ b/chrome/app/resources/locale_settings_or.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_pl.rc b/chrome/app/resources/locale_settings_pl.rc index 62ec6fa..7a1e94d 100644 --- a/chrome/app/resources/locale_settings_pl.rc +++ b/chrome/app/resources/locale_settings_pl.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_pt-BR.rc b/chrome/app/resources/locale_settings_pt-BR.rc index 2996d8a..7a9f773 100644 --- a/chrome/app/resources/locale_settings_pt-BR.rc +++ b/chrome/app/resources/locale_settings_pt-BR.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_pt-PT.rc b/chrome/app/resources/locale_settings_pt-PT.rc index 7092ce2..b761d35 100644 --- a/chrome/app/resources/locale_settings_pt-PT.rc +++ b/chrome/app/resources/locale_settings_pt-PT.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_ro.rc b/chrome/app/resources/locale_settings_ro.rc index 0885cf1..c8853c3 100644 --- a/chrome/app/resources/locale_settings_ro.rc +++ b/chrome/app/resources/locale_settings_ro.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_ru.rc b/chrome/app/resources/locale_settings_ru.rc index bef3202..d606d69 100644 --- a/chrome/app/resources/locale_settings_ru.rc +++ b/chrome/app/resources/locale_settings_ru.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_sk.rc b/chrome/app/resources/locale_settings_sk.rc index 8ab1f76..1acbfdf 100644 --- a/chrome/app/resources/locale_settings_sk.rc +++ b/chrome/app/resources/locale_settings_sk.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_sl.rc b/chrome/app/resources/locale_settings_sl.rc index d842bf6..1a0351f 100644 --- a/chrome/app/resources/locale_settings_sl.rc +++ b/chrome/app/resources/locale_settings_sl.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_sr.rc b/chrome/app/resources/locale_settings_sr.rc index 45c6e57..e78a8e0 100644 --- a/chrome/app/resources/locale_settings_sr.rc +++ b/chrome/app/resources/locale_settings_sr.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_sv.rc b/chrome/app/resources/locale_settings_sv.rc index f894dc4..256c925 100644 --- a/chrome/app/resources/locale_settings_sv.rc +++ b/chrome/app/resources/locale_settings_sv.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_ta.rc b/chrome/app/resources/locale_settings_ta.rc index 0bf319a..dc256e8 100644 --- a/chrome/app/resources/locale_settings_ta.rc +++ b/chrome/app/resources/locale_settings_ta.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_te.rc b/chrome/app/resources/locale_settings_te.rc index 6cbe87f..674b833 100644 --- a/chrome/app/resources/locale_settings_te.rc +++ b/chrome/app/resources/locale_settings_te.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_th.rc b/chrome/app/resources/locale_settings_th.rc index 1b3ce4e..cc2d0d6 100644 --- a/chrome/app/resources/locale_settings_th.rc +++ b/chrome/app/resources/locale_settings_th.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_tr.rc b/chrome/app/resources/locale_settings_tr.rc index dfb799a..b2de723 100644 --- a/chrome/app/resources/locale_settings_tr.rc +++ b/chrome/app/resources/locale_settings_tr.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_uk.rc b/chrome/app/resources/locale_settings_uk.rc index 7373322..ee7df04 100644 --- a/chrome/app/resources/locale_settings_uk.rc +++ b/chrome/app/resources/locale_settings_uk.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_vi.rc b/chrome/app/resources/locale_settings_vi.rc index b1c18ff..c8b4b41 100644 --- a/chrome/app/resources/locale_settings_vi.rc +++ b/chrome/app/resources/locale_settings_vi.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_zh-CN.rc b/chrome/app/resources/locale_settings_zh-CN.rc index 213521b..ff158c2 100644 --- a/chrome/app/resources/locale_settings_zh-CN.rc +++ b/chrome/app/resources/locale_settings_zh-CN.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/app/resources/locale_settings_zh-TW.rc b/chrome/app/resources/locale_settings_zh-TW.rc index 3e0fa84..12aa07c 100644 --- a/chrome/app/resources/locale_settings_zh-TW.rc +++ b/chrome/app/resources/locale_settings_zh-TW.rc @@ -1,4 +1,4 @@ -#include "chrome/app/locales/locale_settings.h" +#include "grit/locale_settings.h" STRINGTABLE BEGIN diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 4be39fb..a5ce91a 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -46,7 +46,6 @@ #include <windows.h> #include <shellapi.h> -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/automation/ui_controls.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_url_handler.h" @@ -71,9 +70,9 @@ #include "chrome/browser/window_sizer.h" #include "chrome/common/child_process_host.h" #include "chrome/common/win_util.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #endif // OS_WIN diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index d92c15f..7f4c10d 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -14,7 +14,6 @@ #include "base/string_util.h" #include "base/thread.h" #include "base/tracked_objects.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" @@ -30,6 +29,10 @@ #include "chrome/common/resource_bundle.h" #include "chrome/renderer/about_handler.h" #include "googleurl/src/gurl.h" +#include "grit/browser_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "webkit/glue/webkit_glue.h" #ifdef CHROME_V8 #include "v8/include/v8.h" @@ -40,11 +43,6 @@ #include "chrome/browser/views/about_network_dialog.h" #endif -// Generated by GRIT -#include "browser_resources.h" -#include "chromium_strings.h" -#include "generated_resources.h" - // The URL scheme used for the about ui. static const char kAboutScheme[] = "about"; diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index c3f03bd..047103a 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -37,14 +37,13 @@ #if defined(OS_WIN) #include "base/win_util.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/automation/automation_provider.h" #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/common/resource_bundle.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" #endif diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index c817905..4a77e3a 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -6,7 +6,6 @@ #include "base/histogram.h" #include "base/string_piece.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" @@ -30,11 +29,10 @@ #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" #endif - -// Generated by GRIT -#include "browser_resources.h" -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/browser_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" // The URL scheme used for the new tab. static const char kNewTabUIScheme[] = "chrome-internal"; diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 103b93b..83d798f 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -12,8 +12,6 @@ #include "base/file_util.h" #include "base/scoped_clipboard_writer.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_manager.h" #include "chrome/common/clipboard_service.h" @@ -23,7 +21,9 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/view.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" #include "skia/ext/image_operations.h" #include "SkPath.h" #include "SkShader.h" diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 21070b2..0602de7 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -10,7 +10,6 @@ #include "base/path_service.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" @@ -34,6 +33,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/render_messages.h" #include "chrome/common/resource_bundle.h" +#include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" #if defined(OS_POSIX) diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 712aeb4..7cf8171 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -7,7 +7,6 @@ #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_operation_notification_details.h" #include "chrome/browser/dom_ui/new_tab_ui.h" @@ -20,12 +19,11 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "generated_resources.h" +#include "grit/browser_resources.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "net/base/escape.h" -// Generated by GRIT -#include "browser_resources.h" - // For malware interstitial pages, we link the problematic URL to Google's // diagnostic page. #if defined(GOOGLE_CHROME_BUILD) diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index bfb9d43..c1a4415 100644 --- a/chrome/browser/search_engines/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/history/history.h" @@ -23,6 +22,7 @@ #include "chrome/common/stl_util-inl.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_parse.h" +#include "grit/locale_settings.h" #include "net/base/net_util.h" #include "unicode/rbbi.h" #include "unicode/uchar.h" diff --git a/chrome/browser/spellchecker.cc b/chrome/browser/spellchecker.cc index 62cff23..c36c522 100644 --- a/chrome/browser/spellchecker.cc +++ b/chrome/browser/spellchecker.cc @@ -11,7 +11,6 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/thread.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/url_fetcher.h" #if defined(OS_WIN) @@ -25,10 +24,10 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/third_party/hunspell/src/hunspell/hunspell.hxx" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "net/url_request/url_request.h" -#include "generated_resources.h" - using base::TimeTicks; static const int kMaxSuggestions = 5; // Max number of dictionary suggestions. diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc index 7f6cc79..c1c0fd9 100644 --- a/chrome/browser/tab_contents/web_contents.cc +++ b/chrome/browser/tab_contents/web_contents.cc @@ -9,7 +9,6 @@ #include "base/file_version_info.h" #include "base/process_util.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/autofill_manager.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" @@ -34,6 +33,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/render_messages.h" +#include "grit/locale_settings.h" #include "net/base/mime_util.h" #include "net/base/net_errors.h" #include "net/base/registry_controlled_domain.h" @@ -55,7 +55,7 @@ #include "chrome/common/resource_bundle.h" #endif -#include "generated_resources.h" +#include "grit/generated_resources.h" #if !defined(OS_MACOSX) // TODO(port): port this to mac. diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 2241641..347e717a 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -10,8 +10,6 @@ #include "base/string_util.h" #include "base/win_util.h" #include "base/word_iterator.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" @@ -25,11 +23,12 @@ #include "chrome/views/text_field.h" #include "chrome/views/throbber.h" #include "chrome/views/window.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" #include "webkit/glue/webkit_glue.h" -#include "chromium_strings.h" -#include "generated_resources.h" - namespace { // The pixel width of the version text field. Ideally, we'd like to have the // bounds set to the edge of the icon. However, the icon is not a view but a diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index 8b701f9..b95a417 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -7,7 +7,6 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -19,9 +18,9 @@ #include "chrome/views/label.h" #include "chrome/views/window.h" #include "googleurl/src/gurl.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" using base::Time; using views::ColumnSet; diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index efb8360..f009e83 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "base/thread.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" #include "chrome/browser/bookmarks/bookmark_html_writer.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -32,9 +31,10 @@ #include "chrome/views/menu_button.h" #include "chrome/views/single_split_view.h" #include "chrome/views/window.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "skia/ext/skia_utils.h" -#include "generated_resources.h" // If non-null, there is an open editor and this is the window it is contained // in it. diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index bf43013..4b3a5fa 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -8,7 +8,6 @@ #include <fstream> #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_util.h" @@ -24,12 +23,12 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/Window.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "net/base/escape.h" #include "unicode/locid.h" -#include "chromium_strings.h" -#include "generated_resources.h" - using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index 2bdd1f2..cfcb7f5 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/clear_browsing_data.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/standard_layout.h" @@ -17,10 +16,10 @@ #include "chrome/views/window.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" -#include "generated_resources.h" - using base::Time; using base::TimeDelta; diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 8b6dc06..79fa9c0 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/first_run_bubble.h" #include "base/win_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" @@ -19,9 +18,9 @@ #include "chrome/views/label.h" #include "chrome/views/native_button.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" namespace { diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index 2e50325..e5d89cc 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -4,8 +4,6 @@ #include "chrome/browser/views/first_run_customize_view.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" @@ -18,9 +16,10 @@ #include "chrome/views/label.h" #include "chrome/views/throbber.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile, ImporterHost* importer_host, diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index 810a31c..a10aae2 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -4,8 +4,6 @@ #include "chrome/browser/views/first_run_view.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" @@ -19,9 +17,10 @@ #include "chrome/views/throbber.h" #include "chrome/views/separator.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" namespace { diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc index f940ce4..b9b9a8a 100644 --- a/chrome/browser/views/importer_lock_view.cc +++ b/chrome/browser/views/importer_lock_view.cc @@ -4,15 +4,14 @@ #include "chrome/browser/views/importer_lock_view.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/label.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc index 87d3001..e7bd61c 100644 --- a/chrome/browser/views/importer_view.cc +++ b/chrome/browser/views/importer_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/importer_view.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" @@ -12,8 +11,8 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/window.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index 783a83c..b87819a 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -4,16 +4,15 @@ #include "chrome/browser/views/importing_progress_view.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/throbber.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" //////////////////////////////////////////////////////////////////////////////// // ImportingProgressView, public: diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index aa30c89..c1442f0 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -8,8 +8,6 @@ #include "base/gfx/png_decoder.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/metrics/user_metrics.h" @@ -29,10 +27,11 @@ #include "chrome/views/text_field.h" #include "chrome/views/window.h" #include "googleurl/src/gurl.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" -#include "generated_resources.h" - using views::GridLayout; using views::NativeButton; using views::TableColumn; diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc index 2d49a8c..466d91a 100644 --- a/chrome/browser/views/new_profile_dialog.cc +++ b/chrome/browser/views/new_profile_dialog.cc @@ -8,16 +8,15 @@ #include "base/logging.h" #include "base/file_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/user_data_manager.h" #include "chrome/common/l10n_util.h" #include "chrome/views/message_box_view.h" #include "chrome/views/text_field.h" #include "chrome/views/view.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" // static void NewProfileDialog::RunDialog() { diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index c73b858..ac20ed1 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -15,7 +15,6 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/gfx/native_theme.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" @@ -39,11 +38,11 @@ #include "chrome/views/combo_box.h" #include "chrome/views/grid_layout.h" #include "chrome/views/scroll_view.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" #include "net/base/ssl_config_service.h" -#include "chromium_strings.h" -#include "generated_resources.h" - using views::GridLayout; using views::ColumnSet; diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index f33f104..19825ef 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -8,8 +8,6 @@ #include "base/string_util.h" #include "base/time_format.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/color_utils.h" @@ -21,7 +19,9 @@ #include "chrome/views/label.h" #include "chrome/views/text_field.h" #include "chrome/views/table_view.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" #include "net/base/cookie_monster.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc index 950d104..3939b25 100644 --- a/chrome/browser/views/options/fonts_languages_window_view.cc +++ b/chrome/browser/views/options/fonts_languages_window_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/options/fonts_languages_window_view.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/options/fonts_page_view.h" #include "chrome/browser/views/options/languages_page_view.h" @@ -14,9 +13,9 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" // static static FontsLanguagesWindowView* instance_ = NULL; diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 3f41bbd..c39b464 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -11,8 +11,6 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" -#include "grit/theme_resources.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/shell_dialogs.h" @@ -30,7 +28,9 @@ #include "chrome/views/radio_button.h" #include "chrome/views/text_field.h" #include "chrome/views/widget.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" +#include "grit/locale_settings.h" #include "skia/include/SkBitmap.h" class DefaultEncodingComboboxModel : public views::ComboBox::Model { diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index 9ff07f5..80ed294 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -8,7 +8,6 @@ #include "chrome/browser/views/options/options_group_view.h" #include "base/gfx/native_theme.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/chrome_canvas.h" @@ -17,7 +16,8 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/separator.h" -#include "generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/generated_resources.h" static const int kLeftColumnWidthChars = 20; static const int kOptionsGroupViewColumnSpacing = 30; diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index 5b23707..fbe4003 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/options_window.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/options/advanced_page_view.h" @@ -22,9 +21,9 @@ #include "chrome/views/tabbed_pane.h" #include "chrome/views/root_view.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" /////////////////////////////////////////////////////////////////////////////// // OptionsWindowView diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index 77f4847..418d31e 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -9,8 +9,6 @@ #include "base/string_util.h" #include "base/time_format.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/history/history.h" @@ -28,10 +26,12 @@ #include "chrome/views/label.h" #include "chrome/views/native_button.h" #include "chrome/views/separator.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" #include "net/base/cert_status_flags.h" #include "net/base/x509_certificate.h" #include "skia/include/SkColor.h" -#include "generated_resources.h" using base::Time; diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc index bfcfa1f..0600cd8 100644 --- a/chrome/browser/views/select_profile_dialog.cc +++ b/chrome/browser/views/select_profile_dialog.cc @@ -8,7 +8,6 @@ #include "base/logging.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/views/new_profile_dialog.h" #include "chrome/browser/views/standard_layout.h" @@ -19,9 +18,9 @@ #include "chrome/views/message_box_view.h" #include "chrome/views/view.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index a0544eb..e195bae 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -6,8 +6,6 @@ #include "base/gfx/png_decoder.h" #include "base/string_util.h" -#include "chrome/app/locales/locale_settings.h" -#include "grit/theme_resources.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -23,7 +21,9 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/text_field.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" +#include "grit/theme_resources.h" #include "net/base/net_util.h" using base::Time; diff --git a/chrome/chrome.xcodeproj/generate_headers.sh b/chrome/chrome.xcodeproj/generate_headers.sh index 775d4e5..27a6863 100755 --- a/chrome/chrome.xcodeproj/generate_headers.sh +++ b/chrome/chrome.xcodeproj/generate_headers.sh @@ -78,3 +78,13 @@ then -i "${PROJECT_DIR}/browser/debugger/debugger/debugger_resources.grd" build \ -o "${GRIT_DIR}" fi + +# compare locale_settings.grd to locale_settings.h. If the .h is +# older or doesn't exist, rebuild it +if [ "${GRIT_DIR}/grit/locale_settings.h" -ot \ + "${PROJECT_DIR}/app/resources/locale_settings.grd" ] +then + python "${PROJECT_DIR}/../tools/grit/grit.py" \ + -i "${PROJECT_DIR}/app/resources/locale_settings.grd" build \ + -o "${GRIT_DIR}" +fi diff --git a/chrome/common/gfx/chrome_font_win.cc b/chrome/common/gfx/chrome_font_win.cc index 062b578..d297e23 100644 --- a/chrome/common/gfx/chrome_font_win.cc +++ b/chrome/common/gfx/chrome_font_win.cc @@ -11,10 +11,9 @@ #include "base/logging.h" #include "base/win_util.h" -#include "chrome/app/locales/locale_settings.h" #include "chrome/common/l10n_util.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/locale_settings.h" /*static*/ ChromeFont::HFontRef* ChromeFont::base_font_ref_; |