diff options
Diffstat (limited to 'chrome/browser')
37 files changed, 56 insertions, 5 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index d383484..2be43a7 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -50,6 +50,7 @@ #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" +#include "chromium_strings.h" #include "generated_resources.h" static BrowserList g_browserlist; diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 4e09af6..3712de2 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -41,6 +41,7 @@ #include "v8/public/v8.h" #endif +#include "chromium_strings.h" #include "generated_resources.h" // The URL scheme used for the about ui. diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index b2365a5..e7437ce 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -40,6 +40,7 @@ #include "net/base/cookie_monster.h" #include "net/base/net_util.h" +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 8555784..dbd4d02 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -56,6 +56,7 @@ #include "net/base/winsock_init.h" #include "net/http/http_network_layer.h" +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index ce76d95..6fd93cf 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -16,6 +16,7 @@ #include "net/base/net_util.h" #include "net/url_request/url_request_unittest.h" +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 5a764b4..187e25a 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -24,6 +24,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" +#include "chromium_strings.h" #include "generated_resources.h" // The URL scheme used for the new tab. diff --git a/chrome/browser/external_protocol_dialog.cc b/chrome/browser/external_protocol_dialog.cc index 86c18e3..f8aa349 100644 --- a/chrome/browser/external_protocol_dialog.cc +++ b/chrome/browser/external_protocol_dialog.cc @@ -15,6 +15,7 @@ #include "chrome/views/message_box_view.h" #include "chrome/views/window.h" +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index 94f980e..a1adca1 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -43,6 +43,8 @@ #include "chrome/common/notification_service.h" #include "chrome/common/sqlite_utils.h" #include "chrome/common/thumbnail_score.h" + +#include "chromium_strings.h" #include "generated_resources.h" using history::HistoryBackend; diff --git a/chrome/browser/password_manager.cc b/chrome/browser/password_manager.cc index 180cee0..fa4ae3b 100644 --- a/chrome/browser/password_manager.cc +++ b/chrome/browser/password_manager.cc @@ -14,6 +14,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" +#include "chromium_strings.h" #include "generated_resources.h" // static diff --git a/chrome/browser/session_crashed_view.cc b/chrome/browser/session_crashed_view.cc index 0d32d6e..6d0f15f 100644 --- a/chrome/browser/session_crashed_view.cc +++ b/chrome/browser/session_crashed_view.cc @@ -8,6 +8,8 @@ #include "chrome/browser/session_restore.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" + +#include "chromium_strings.h" #include "generated_resources.h" SessionCrashedView::SessionCrashedView(Profile* profile) diff --git a/chrome/browser/simple_vista_frame.cc b/chrome/browser/simple_vista_frame.cc index e0fa68b..8f5a1eb 100644 --- a/chrome/browser/simple_vista_frame.cc +++ b/chrome/browser/simple_vista_frame.cc @@ -17,6 +17,7 @@ #include "chrome/common/resource_bundle.h" #include "net/base/net_util.h" +#include "chromium_strings.h" #include "generated_resources.h" // Number of frames for our throbber. diff --git a/chrome/browser/simple_xp_frame.cc b/chrome/browser/simple_xp_frame.cc index 8b65bb8..4546fc2 100644 --- a/chrome/browser/simple_xp_frame.cc +++ b/chrome/browser/simple_xp_frame.cc @@ -26,6 +26,7 @@ #include "net/base/net_util.h" #include "SkBitmap.h" +#include "chromium_strings.h" #include "generated_resources.h" // The title bar text color. diff --git a/chrome/browser/ssl_error_info.cc b/chrome/browser/ssl_error_info.cc index 34a074b..8bae914 100644 --- a/chrome/browser/ssl_error_info.cc +++ b/chrome/browser/ssl_error_info.cc @@ -14,6 +14,7 @@ #include "net/base/ssl_info.h" #include "googleurl/src/gurl.h" +#include "chromium_strings.h" #include "generated_resources.h" SSLErrorInfo::SSLErrorInfo(const std::wstring& title, diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index b2e9798..a561bb2 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -26,6 +26,7 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" +#include "chromium_strings.h" #include "generated_resources.h" // The task manager window default size. diff --git a/chrome/browser/user_data_dir_dialog.cc b/chrome/browser/user_data_dir_dialog.cc index 3859a5b..840750e 100644 --- a/chrome/browser/user_data_dir_dialog.cc +++ b/chrome/browser/user_data_dir_dialog.cc @@ -8,6 +8,7 @@ #include "chrome/views/message_box_view.h" #include "chrome/views/window.h" +#include "chromium_strings.h" #include "generated_resources.h" // static diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index c4d40bb..fc0ec12 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -24,6 +24,7 @@ #include "chrome/views/window.h" #include "webkit/glue/webkit_glue.h" +#include "chromium_strings.h" #include "generated_resources.h" // The pixel width of the version text field. Ideally, we'd like to have the diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index 66a5f88..b8d4a11 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -18,9 +18,11 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/window.h" -#include "generated_resources.h" #include "googleurl/src/gurl.h" +#include "chromium_strings.h" +#include "generated_resources.h" + using ChromeViews::ColumnSet; using ChromeViews::GridLayout; using ChromeViews::Label; diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index 7b55335..cbc592c 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -24,10 +24,12 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/Window.h" -#include "generated_resources.h" #include "net/base/escape.h" #include "unicode/locid.h" +#include "chromium_strings.h" +#include "generated_resources.h" + using ChromeViews::ColumnSet; using ChromeViews::GridLayout; diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index 9ea3220..008cd81 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -30,9 +30,11 @@ #include "chrome/views/focus_manager.h" #include "chrome/views/hwnd_view.h" #include "chrome/views/non_client_view.h" -#include "generated_resources.h" #include "net/base/net_util.h" +#include "chromium_strings.h" +#include "generated_resources.h" + namespace ChromeViews { class ClientView; } diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index b13fb18..0221814 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -18,6 +18,7 @@ #include "chrome/views/native_button.h" #include "chrome/views/window.h" +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index 0c124b4..a23524e 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -20,6 +20,7 @@ #include "chrome/views/throbber.h" #include "chrome/views/window.h" +#include "chromium_strings.h" #include "generated_resources.h" FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile, diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index 731182b..690cd72 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -19,6 +19,7 @@ #include "chrome/views/separator.h" #include "chrome/views/window.h" +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index cb08ab7..ab02f4c 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -16,6 +16,8 @@ #include "chrome/browser/views/toolbar_star_toggle.h" #include "chrome/browser/views/toolbar_view.h" #include "chrome/common/l10n_util.h" + +#include "chromium_strings.h" #include "generated_resources.h" // Status Bubble metrics. diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc index d6380c9..68a0325 100644 --- a/chrome/browser/views/frame/browser_view2.cc +++ b/chrome/browser/views/frame/browser_view2.cc @@ -26,6 +26,8 @@ #include "chrome/common/win_util.h" #include "chrome/views/view.h" #include "chrome/views/window.h" + +#include "chromium_strings.h" #include "generated_resources.h" // static diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index 4b91dfe..fa1691d 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -22,6 +22,8 @@ #include "chrome/views/group_table_view.h" #include "chrome/views/image_view.h" #include "chrome/views/native_button.h" + +#include "chromium_strings.h" #include "generated_resources.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc index 6c56553b..d1c5f2f 100644 --- a/chrome/browser/views/importer_lock_view.cc +++ b/chrome/browser/views/importer_lock_view.cc @@ -9,6 +9,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/label.h" +#include "chromium_strings.h" #include "generated_resources.h" using ChromeViews::ColumnSet; diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index 0d55d0e..8dbc8ec 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -11,6 +11,8 @@ #include "chrome/views/label.h" #include "chrome/views/throbber.h" #include "chrome/views/window.h" + +#include "chromium_strings.h" #include "generated_resources.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index c70d80e..1bb4343 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -41,6 +41,7 @@ #include "chrome/views/scroll_view.h" #include "net/base/ssl_config_service.h" +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index 7d7fc18..3476134 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -19,6 +19,8 @@ #include "chrome/views/native_button.h" #include "chrome/views/scroll_view.h" #include "chrome/views/window.h" + +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc index 48d5cf7..fb87568 100644 --- a/chrome/browser/views/options/fonts_languages_window_view.cc +++ b/chrome/browser/views/options/fonts_languages_window_view.cc @@ -14,6 +14,8 @@ #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" // static diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 4dd8ec3..349fb5f 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -34,9 +34,11 @@ #include "chrome/views/radio_button.h" #include "chrome/views/table_view.h" #include "chrome/views/text_field.h" -#include "generated_resources.h" #include "skia/include/SkBitmap.h" +#include "chromium_strings.h" +#include "generated_resources.h" + static const int kStartupRadioGroup = 1; static const int kHomePageRadioGroup = 2; static const SkColor kDefaultBrowserLabelColor = SkColorSetRGB(0, 135, 0); diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 8563bcd..485e35b 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -34,10 +34,12 @@ #include "chrome/views/tabbed_pane.h" #include "chrome/views/text_field.h" #include "chrome/views/view_container.h" -#include "generated_resources.h" #include "skia/include/SkBitmap.h" #include "unicode/uloc.h" +#include "chromium_strings.h" +#include "generated_resources.h" + static const wchar_t* const g_supported_spellchecker_languages[] = { L"en-US", L"en-GB", diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index 9159410..97dfc7e 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -19,6 +19,8 @@ #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" static const int kDefaultWindowWidthChars = 85; diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc index f46a9d5..1cfafff 100644 --- a/chrome/browser/views/restart_message_box.cc +++ b/chrome/browser/views/restart_message_box.cc @@ -8,6 +8,7 @@ #include "chrome/views/message_box_view.h" #include "chrome/views/window.h" +#include "chromium_strings.h" #include "generated_resources.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 4baab1b..5a40f88 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -40,6 +40,7 @@ #include "chrome/views/tooltip_manager.h" #include "net/base/net_util.h" +#include "chromium_strings.h" #include "generated_resources.h" static const int kControlHorizOffset = 4; diff --git a/chrome/browser/vista_frame.cc b/chrome/browser/vista_frame.cc index efe7d7f0b3..c1c73ac 100644 --- a/chrome/browser/vista_frame.cc +++ b/chrome/browser/vista_frame.cc @@ -40,6 +40,7 @@ #include "chrome/views/hwnd_view_container.h" #include "chrome/views/hwnd_notification_source.h" +#include "chromium_strings.h" #include "generated_resources.h" // By how much the toolbar overlaps with the tab strip. diff --git a/chrome/browser/xp_frame.cc b/chrome/browser/xp_frame.cc index fbe65ed..cba5906 100644 --- a/chrome/browser/xp_frame.cc +++ b/chrome/browser/xp_frame.cc @@ -41,6 +41,7 @@ #include "chrome/views/tooltip_manager.h" #include "chrome/views/view.h" +#include "chromium_strings.h" #include "generated_resources.h" // Needed for accessibility support. |