diff options
Diffstat (limited to 'chrome/browser')
32 files changed, 92 insertions, 117 deletions
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; |