diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-22 23:03:27 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-22 23:03:27 +0000 |
| commit | 34ac8f3dd803e412fe5b34d19fdd46c588aefccf (patch) | |
| tree | f30f606cf18beee326e500246fa1a3f645faa42c | |
| parent | cb910e336663dd63a35f2721c50419b0fdc1500e (diff) | |
| download | chromium_src-34ac8f3dd803e412fe5b34d19fdd46c588aefccf.zip chromium_src-34ac8f3dd803e412fe5b34d19fdd46c588aefccf.tar.gz chromium_src-34ac8f3dd803e412fe5b34d19fdd46c588aefccf.tar.bz2 | |
Update include paths for grit files. Go ahead and resort
the headers too.
Review URL: http://codereview.chromium.org/21472
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10167 0039d316-1c4b-4281-b951-d872f2087c98
156 files changed, 234 insertions, 355 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index a124a1c..5a6a770 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -10,8 +10,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" AlternateNavURLFetcher::AlternateNavURLFetcher( const GURL& alternate_nav_url) diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index 1281813..a735947 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -23,11 +23,10 @@ #include "chrome/common/pref_service.h" #include "googleurl/src/gurl.h" #include "googleurl/src/url_canon_ip.h" +#include "grit/generated_resources.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" -#include "generated_resources.h" - using base::TimeDelta; // AutocompleteInput ---------------------------------------------------------- diff --git a/chrome/browser/autocomplete/autocomplete_accessibility.cc b/chrome/browser/autocomplete/autocomplete_accessibility.cc index 76eddca..71a0166 100644 --- a/chrome/browser/autocomplete/autocomplete_accessibility.cc +++ b/chrome/browser/autocomplete/autocomplete_accessibility.cc @@ -7,8 +7,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/accessibility/accessible_wrapper.h" #include "chrome/views/view.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" HRESULT AutocompleteAccessibility::Initialize( const AutocompleteEditView* edit_box) { diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc index 6dcbc9e..4b92d0f 100644 --- a/chrome/browser/autocomplete/autocomplete_edit.cc +++ b/chrome/browser/autocomplete/autocomplete_edit.cc @@ -35,10 +35,9 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" #include "googleurl/src/url_util.h" +#include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" -#include "generated_resources.h" - #pragma comment(lib, "oleacc.lib") // Needed for accessibility support. /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/autocomplete/autocomplete_popup.cc b/chrome/browser/autocomplete/autocomplete_popup.cc index dd1935d..ecf29fd 100644 --- a/chrome/browser/autocomplete/autocomplete_popup.cc +++ b/chrome/browser/autocomplete/autocomplete_popup.cc @@ -8,7 +8,6 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/net/dns_global.h" @@ -20,6 +19,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" +#include "grit/theme_resources.h" #include "third_party/icu38/public/common/unicode/ubidi.h" namespace { diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index defb656..c267956 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -11,11 +11,10 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/l10n_util.h" +#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_util.h" -#include "generated_resources.h" - // static std::wstring KeywordProvider::SplitReplacementStringFromInput( const std::wstring& input) { diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index e931912..8e39bd0 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -16,12 +16,11 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "googleurl/src/url_util.h" +#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_status.h" -#include "generated_resources.h" - using base::Time; using base::TimeDelta; diff --git a/chrome/browser/back_forward_menu_model.cc b/chrome/browser/back_forward_menu_model.cc index f28c60c..48254c3 100644 --- a/chrome/browser/back_forward_menu_model.cc +++ b/chrome/browser/back_forward_menu_model.cc @@ -11,6 +11,7 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/common/l10n_util.h" +#include "grit/generated_resources.h" #include "net/base/registry_controlled_domain.h" #if defined(OS_WIN) @@ -21,8 +22,6 @@ #include "chrome/common/temp_scaffolding_stubs.h" #endif -#include "generated_resources.h" - const int BackForwardMenuModel::kMaxHistoryItems = 12; const int BackForwardMenuModel::kMaxChapterStops = 5; diff --git a/chrome/browser/back_forward_menu_model_win.cc b/chrome/browser/back_forward_menu_model_win.cc index 2a030da..55e781c 100644 --- a/chrome/browser/back_forward_menu_model_win.cc +++ b/chrome/browser/back_forward_menu_model_win.cc @@ -6,8 +6,7 @@ #include "chrome/browser/browser.h" #include "chrome/browser/metrics/user_metrics.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" // static BackForwardMenuModel* BackForwardMenuModel::Create(Browser* browser, diff --git a/chrome/browser/base_history_model.cc b/chrome/browser/base_history_model.cc index b22aa26..f8e5d17 100644 --- a/chrome/browser/base_history_model.cc +++ b/chrome/browser/base_history_model.cc @@ -6,9 +6,9 @@ #include "base/gfx/jpeg_codec.h" #include "base/gfx/png_decoder.h" -#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/common/resource_bundle.h" +#include "grit/theme_resources.h" #include "SkBitmap.h" // Size of the favicon and thumbnail caches. diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc index 6d6274a..fc4b592 100644 --- a/chrome/browser/bookmarks/bookmark_codec.cc +++ b/chrome/browser/bookmarks/bookmark_codec.cc @@ -9,8 +9,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/common/l10n_util.h" #include "googleurl/src/gurl.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using base::Time; diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc index 0ca63246..c4d067b 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu.cc @@ -20,8 +20,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/window.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/bookmarks/bookmark_context_menu_test.cc b/chrome/browser/bookmarks/bookmark_context_menu_test.cc index 0bec1ca..e5a07ad 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_test.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_test.cc @@ -11,10 +11,9 @@ #include "chrome/common/pref_service.h" #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/test/testing_profile.h" +#include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" -#include "generated_resources.h" - namespace { // PageNavigator implementation that records the URL. diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc index 7473d62..a743255 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc @@ -4,11 +4,10 @@ #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" -#include "grit/theme_resources.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" BookmarkFolderTreeModel::BookmarkFolderTreeModel(BookmarkModel* model) : views::TreeNodeModel<FolderNode>(new FolderNode(NULL)), diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc index c6f0a00..ac0037b 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc @@ -7,10 +7,9 @@ #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" #include "chrome/test/testing_profile.h" #include "chrome/views/tree_view.h" +#include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" -#include "generated_resources.h" - // Base class for bookmark model tests. // Initial state of the bookmark model is as follows: // bb diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index cb53639..12c8c97 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -12,8 +12,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/scoped_vector.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using base::Time; diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc index d2f4e6d..99c2f29 100644 --- a/chrome/browser/bookmarks/bookmark_table_model.cc +++ b/chrome/browser/bookmarks/bookmark_table_model.cc @@ -9,13 +9,12 @@ #include "base/string_util.h" #include "base/time.h" #include "base/time_format.h" -#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "googleurl/src/gurl.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" namespace { diff --git a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc index 04055ee..b709b28 100644 --- a/chrome/browser/bookmarks/bookmark_table_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_table_model_unittest.cc @@ -6,10 +6,9 @@ #include "base/time.h" #include "chrome/browser/bookmarks/bookmark_table_model.h" #include "chrome/test/testing_profile.h" +#include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" -#include "generated_resources.h" - using base::Time; using base::TimeDelta; diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 595220fb..d6a83691 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -19,9 +19,8 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/views/event.h" #include "chrome/views/tree_node_iterator.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index b1436fc..88c5978 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -44,9 +44,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.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" #if defined(OS_POSIX) // TODO(port): get rid of this include. It's used just to provide declarations @@ -98,7 +97,7 @@ #endif // defined(OS_WIN) #if !defined(OS_MACOSX) -#include "net_resources.h" +#include "grit/net_resources.h" #include "chrome/browser/process_singleton.h" #endif diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index a7a0f6c..b6eec50 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -21,9 +21,8 @@ #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/shell_util.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" // Displays a warning message if the user is running chrome on windows 2000. // Returns true if the OS is win2000, false otherwise. diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 2c91261..b8d90e9 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -16,9 +16,8 @@ #include "chrome/test/ui/ui_test.h" #include "net/base/net_util.h" #include "net/url_request/url_request_unittest.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 2be87ae..5cfb87e 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -13,10 +13,9 @@ #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/l10n_util.h" +#include "grit/generated_resources.h" #include "unicode/ucnv.h" -#include "generated_resources.h" - namespace { // The maximum length of short list of recently user selected encodings is 3. diff --git a/chrome/browser/debugger/debugger_window.cc b/chrome/browser/debugger/debugger_window.cc index bd61c95..1f62d01 100644 --- a/chrome/browser/debugger/debugger_window.cc +++ b/chrome/browser/debugger/debugger_window.cc @@ -13,7 +13,7 @@ #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/l10n_util.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" DebuggerWindow::DebuggerWindow() : window_(NULL), view_(NULL), diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 0062cf0..48a4f7fd 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -18,11 +18,9 @@ #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/time_format.h" - -// 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" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index 5fa37a8..cf2cc30 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -8,8 +8,7 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using base::TimeDelta; diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 86c61152..275b385 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -31,6 +31,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/stl_util-inl.h" #include "googleurl/src/gurl.h" +#include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" @@ -43,8 +44,6 @@ #include "chrome/common/win_util.h" #endif -#include "generated_resources.h" - // Periodically update our observers. class DownloadItemUpdateTask : public Task { public: diff --git a/chrome/browser/download/download_request_manager.cc b/chrome/browser/download/download_request_manager.cc index af6a22c..55b48fe 100644 --- a/chrome/browser/download/download_request_manager.cc +++ b/chrome/browser/download/download_request_manager.cc @@ -17,8 +17,7 @@ #include "chrome/common/notification_service.h" #include "chrome/views/dialog_delegate.h" #include "chrome/views/message_box_view.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index c40788c..c744cd5 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -27,6 +27,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/stl_util-inl.h" +#include "grit/generated_resources.h" #include "net/base/io_buffer.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" @@ -46,8 +47,6 @@ #include "chrome/common/temp_scaffolding_stubs.h" #endif -#include "generated_resources.h" - using base::Time; namespace { diff --git a/chrome/browser/download/save_page_model.cc b/chrome/browser/download/save_page_model.cc index 1a78e24..379f2b2 100644 --- a/chrome/browser/download/save_page_model.cc +++ b/chrome/browser/download/save_page_model.cc @@ -8,8 +8,7 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/save_package.h" #include "chrome/common/l10n_util.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" SavePageModel::SavePageModel(SavePackage* save, DownloadItem* download) : save_(save), diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc index 040b0cd..8bcfd69 100644 --- a/chrome/browser/drag_utils.cc +++ b/chrome/browser/drag_utils.cc @@ -12,7 +12,6 @@ #include "base/gfx/gdi_util.h" #include "base/gfx/point.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" @@ -21,6 +20,7 @@ #include "chrome/common/win_util.h" #include "chrome/views/text_button.h" #include "googleurl/src/gurl.h" +#include "grit/theme_resources.h" namespace drag_utils { diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc index 6d636a2..9f3daeb 100644 --- a/chrome/browser/encoding_menu_controller_delegate.cc +++ b/chrome/browser/encoding_menu_controller_delegate.cc @@ -13,8 +13,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" EncodingMenuControllerDelegate::EncodingMenuControllerDelegate(Browser* browser) : browser_(browser) { diff --git a/chrome/browser/gtk/browser_toolbar_view_gtk.cc b/chrome/browser/gtk/browser_toolbar_view_gtk.cc index b3c4cfa..e058057 100644 --- a/chrome/browser/gtk/browser_toolbar_view_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_view_gtk.cc @@ -15,9 +15,8 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/l10n_util.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/theme_resources.h" const int BrowserToolbarGtk::kToolbarHeight = 38; diff --git a/chrome/browser/gtk/standard_menus.cc b/chrome/browser/gtk/standard_menus.cc index ceb75d5..bb0b6f8 100644 --- a/chrome/browser/gtk/standard_menus.cc +++ b/chrome/browser/gtk/standard_menus.cc @@ -7,9 +7,8 @@ #include "base/basictypes.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/l10n_util.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc index bcf4ff8..ebc33dd 100644 --- a/chrome/browser/hang_monitor/hung_plugin_action.cc +++ b/chrome/browser/hang_monitor/hung_plugin_action.cc @@ -10,10 +10,9 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/win_util.h" +#include "grit/generated_resources.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" -#include "generated_resources.h" - HungPluginAction::HungPluginAction() : current_hung_plugin_window_(NULL) { } diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index 74118d0..839e3d1 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -44,9 +44,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/thumbnail_score.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" using base::Time; using history::HistoryBackend; diff --git a/chrome/browser/history_tab_ui.cc b/chrome/browser/history_tab_ui.cc index 0f59535..40027c6 100644 --- a/chrome/browser/history_tab_ui.cc +++ b/chrome/browser/history_tab_ui.cc @@ -5,17 +5,16 @@ #include "chrome/browser/history_tab_ui.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/history_model.h" #include "chrome/browser/history_view.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/checkbox.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "net/base/escape.h" -#include "generated_resources.h" - // State key used to identify search text. static const wchar_t kSearchTextKey[] = L"st"; diff --git a/chrome/browser/history_view.cc b/chrome/browser/history_view.cc index 128fa87..f1902e9 100644 --- a/chrome/browser/history_view.cc +++ b/chrome/browser/history_view.cc @@ -24,8 +24,7 @@ #include "chrome/common/win_util.h" #include "chrome/views/link.h" #include "chrome/views/widget.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index 67f24b4..2494bd1 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -15,7 +15,7 @@ #include "chrome/browser/search_engines/template_url_parser.h" #include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" #include "net/base/data_url.h" using base::Time; diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc index cb2f13f..1113722 100644 --- a/chrome/browser/importer/firefox3_importer.cc +++ b/chrome/browser/importer/firefox3_importer.cc @@ -13,7 +13,7 @@ #include "chrome/browser/importer/firefox_importer_utils.h" #include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" using base::Time; diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index d362739..36b6cd7 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -24,8 +24,7 @@ #include "chrome/common/time_format.h" #include "chrome/common/win_util.h" #include "googleurl/src/gurl.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using base::Time; diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 38ff884..88923ca 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -33,11 +33,10 @@ #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" #include "chrome/views/window.h" +#include "grit/generated_resources.h" #include "skia/ext/image_operations.h" #include "webkit/glue/image_decoder.h" -#include "generated_resources.h" - // ProfileWriter. bool ProfileWriter::BookmarkModelIsLoaded() const { diff --git a/chrome/browser/js_before_unload_handler_win.cc b/chrome/browser/js_before_unload_handler_win.cc index 6b651b9..ac31b70 100644 --- a/chrome/browser/js_before_unload_handler_win.cc +++ b/chrome/browser/js_before_unload_handler_win.cc @@ -7,8 +7,7 @@ #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/common/l10n_util.h" #include "chrome/views/message_box_view.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" void RunBeforeUnloadDialog( WebContents* web_contents, diff --git a/chrome/browser/jsmessage_box_handler_win.cc b/chrome/browser/jsmessage_box_handler_win.cc index 541253e..979e7e6 100644 --- a/chrome/browser/jsmessage_box_handler_win.cc +++ b/chrome/browser/jsmessage_box_handler_win.cc @@ -17,8 +17,7 @@ #include "chrome/common/pref_service.h" #include "chrome/views/message_box_view.h" #include "chrome/views/window.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" void RunJavascriptMessageBox(WebContents* web_contents, int dialog_flags, diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc index 1ad5a17..a87f37a 100644 --- a/chrome/browser/login_prompt.cc +++ b/chrome/browser/login_prompt.cc @@ -20,11 +20,10 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/views/dialog_delegate.h" +#include "grit/generated_resources.h" #include "net/base/auth.h" #include "net/url_request/url_request.h" -#include "generated_resources.h" - using namespace std; using views::LoginView; diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index 1b67d72..e961904 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -5,7 +5,6 @@ #include "chrome/browser/password_manager/password_manager.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/l10n_util.h" @@ -15,9 +14,9 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" // After a successful *new* login attempt, we take the PasswordFormManager in // provisional_save_manager_ and move it to a SavePasswordInfoBarDelegate while diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc index 9e8c3b1..9f2938c 100644 --- a/chrome/browser/plugin_installer.cc +++ b/chrome/browser/plugin_installer.cc @@ -5,14 +5,13 @@ #include "chrome/browser/plugin_installer.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "webkit/default_plugin/default_plugin_shared.h" -#include "generated_resources.h" - PluginInstaller::PluginInstaller(WebContents* web_contents) : ConfirmInfoBarDelegate(web_contents), web_contents_(web_contents) { diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 20e5816..c251f8a 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -16,8 +16,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using base::TimeDelta; diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 61a6d9f..978fcf89 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -17,9 +17,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/l10n_util.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" namespace { diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc index f93c5a9..9e61b0a 100644 --- a/chrome/browser/profile_manager.cc +++ b/chrome/browser/profile_manager.cc @@ -19,13 +19,12 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/generated_resources.h" #include "net/http/http_transaction_factory.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_job.h" #include "net/url_request/url_request_job_tracker.h" -#include "generated_resources.h" - #if defined(OS_POSIX) // TODO(port): get rid of this include. It's used just to provide declarations // and stub definitions for classes we encouter during the porting effort. diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index fe0b043..096930d 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -44,6 +44,7 @@ #include "chrome/common/process_watcher.h" #include "chrome/common/render_messages.h" #include "chrome/renderer/render_process.h" +#include "grit/generated_resources.h" #if defined(OS_WIN) @@ -65,7 +66,6 @@ #include "skia/include/SkBitmap.h" -#include "generated_resources.h" namespace { diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index ea7ff1d..867a44d 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -24,10 +24,10 @@ #include "chrome/common/win_util.h" // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h! #include "chrome/views/widget_win.h" +#include "grit/webkit_resources.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webcursor.h" -#include "webkit_resources.h" using base::TimeDelta; diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index 7abd170..fe7cbea 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -8,11 +8,10 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/ui/ui_test.h" +#include "grit/generated_resources.h" #include "net/base/net_util.h" #include "net/url_request/url_request_unittest.h" -#include "generated_resources.h" - using std::wstring; namespace { diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index c2569fe..c98975d 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -19,10 +19,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" - -// Generated by GRIT -#include "browser_resources.h" -#include "generated_resources.h" +#include "grit/browser_resources.h" +#include "grit/generated_resources.h" // Note that we always create a navigation entry with SSL errors. // No error happening loading a sub-resource triggers an interstitial so far. diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index ee12ae1..712985f 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -8,13 +8,12 @@ #include "chrome/browser/cert_store.h" #include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" +#include "googleurl/src/gurl.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" #include "net/base/cert_status_flags.h" #include "net/base/net_errors.h" #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, const std::wstring& details, diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index 195d25e..bc95a53 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -6,7 +6,6 @@ #include "base/message_loop.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/load_from_memory_cache_details.h" #include "chrome/browser/renderer_host/render_view_host.h" @@ -24,11 +23,12 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "net/base/cert_status_flags.h" #include "net/base/net_errors.h" #include "net/url_request/url_request.h" #include "webkit/glue/resource_type.h" -#include "generated_resources.h" #if defined(OS_WIN) // TODO(port): Port these files. diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index 5005ec4..1648a48 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -20,15 +20,13 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/time_format.h" -#include "generated_resources.h" +#include "grit/browser_resources.h" +#include "grit/generated_resources.h" #include "net/base/cert_status_flags.h" #include "net/base/ssl_info.h" #include "webkit/glue/console_message_level.h" #include "webkit/glue/resource_type.h" -// Generated by GRIT -#include "browser_resources.h" - #if defined(OS_WIN) // TODO(port): port these files. #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc index a39bdfa..b1b63f9 100644 --- a/chrome/browser/tab_contents/infobar_delegate.cc +++ b/chrome/browser/tab_contents/infobar_delegate.cc @@ -9,8 +9,7 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/common/l10n_util.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" #if defined(OS_WIN) #include "chrome/browser/tab_contents/tab_contents.h" diff --git a/chrome/browser/tab_contents/interstitial_page.cc b/chrome/browser/tab_contents/interstitial_page.cc index 916e3be..efd911a 100644 --- a/chrome/browser/tab_contents/interstitial_page.cc +++ b/chrome/browser/tab_contents/interstitial_page.cc @@ -14,6 +14,7 @@ #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/notification_service.h" #include "chrome/views/window_delegate.h" +#include "grit/browser_resources.h" #include "net/base/escape.h" #if defined(OS_WIN) @@ -22,9 +23,6 @@ #include "chrome/views/window.h" #endif -// Generated by GRIT -#include "browser_resources.h" - namespace { class ResourceRequestTask : public Task { diff --git a/chrome/browser/tab_contents/native_ui_contents.cc b/chrome/browser/tab_contents/native_ui_contents.cc index fecc5e2..11b7ba5 100644 --- a/chrome/browser/tab_contents/native_ui_contents.cc +++ b/chrome/browser/tab_contents/native_ui_contents.cc @@ -22,8 +22,7 @@ #include "chrome/views/scroll_view.h" #include "chrome/views/throbber.h" #include "chrome/views/widget_win.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h index fc8f487..377e8df 100644 --- a/chrome/browser/tab_contents/navigation_entry.h +++ b/chrome/browser/tab_contents/navigation_entry.h @@ -8,12 +8,12 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/tab_contents/security_style.h" #include "chrome/browser/tab_contents/site_instance.h" #include "chrome/browser/tab_contents/tab_contents_type.h" #include "chrome/common/page_transition_types.h" #include "googleurl/src/gurl.h" +#include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 77455fe..6b031dc 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -11,7 +11,7 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/spellchecker.h" #include "chrome/common/l10n_util.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" RenderViewContextMenu::RenderViewContextMenu( Menu::Delegate* delegate, diff --git a/chrome/browser/tab_contents/render_view_context_menu_controller.cc b/chrome/browser/tab_contents/render_view_context_menu_controller.cc index 53cae10..8882628 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_controller.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_controller.cc @@ -24,6 +24,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_util.h" #include "net/url_request/url_request.h" @@ -37,8 +38,6 @@ #include "chrome/common/win_util.h" #endif -#include "generated_resources.h" - RenderViewContextMenuController::RenderViewContextMenuController( WebContents* source_web_contents, const ContextMenuParams& params) : source_web_contents_(source_web_contents), diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 087198a..4b008dd 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -16,6 +16,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/generated_resources.h" #if defined(OS_WIN) // TODO(port): some of these headers should be ported. @@ -30,8 +31,6 @@ #include "chrome/views/widget.h" #endif -#include "generated_resources.h" - // TODO(port): port the rest of this file. #if defined(OS_WIN) namespace { diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index da79e48..ae17dbe 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -8,7 +8,6 @@ #include "base/stats_table.h" #include "base/string_util.h" #include "base/thread.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -25,12 +24,12 @@ #include "chrome/views/menu.h" #include "chrome/views/native_button.h" #include "chrome/views/window.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #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. static const int kDefaultWidth = 460; static const int kDefaultHeight = 270; diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index 59b83ec..47ff2b4 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -9,7 +9,6 @@ #include "base/process_util.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -21,8 +20,8 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/gfx/icon_util.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" //////////////////////////////////////////////////////////////////////////////// // TaskManagerWebContentsResource class diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc index c1579fd..2004e55 100644 --- a/chrome/browser/toolbar_model.cc +++ b/chrome/browser/toolbar_model.cc @@ -13,10 +13,9 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "grit/generated_resources.h" #include "net/base/net_util.h" -#include "generated_resources.h" - ToolbarModel::ToolbarModel() : input_in_progress_(false) { } diff --git a/chrome/browser/user_data_manager.cc b/chrome/browser/user_data_manager.cc index 0914b5c..2aa4d78 100644 --- a/chrome/browser/user_data_manager.cc +++ b/chrome/browser/user_data_manager.cc @@ -20,14 +20,13 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/l10n_util.h" #include "chrome/installer/util/browser_distribution.h" +#include "grit/chromium_strings.h" #if defined(OS_WIN) #include <windows.h> #include "chrome/installer/util/shell_util.h" #endif -#include "chromium_strings.h" - namespace { // Helper to start chrome for a given profile index. The helper takes care of diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index 1426ba8..8dc96d6 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -13,7 +13,6 @@ #include <math.h> #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/chrome_canvas.h" @@ -25,8 +24,8 @@ #include "chrome/views/background.h" #include "chrome/views/button.h" #include "chrome/views/menu_button.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" namespace { // Menu item ID for the "Notify me when a popup is blocked" checkbox. (All diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 6832ddc..6efe139 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -8,7 +8,6 @@ #include "base/string_util.h" #include "base/base_drag_source.h" -#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" @@ -43,7 +42,8 @@ #include "chrome/views/view_constants.h" #include "chrome/views/widget.h" #include "chrome/views/window.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" using views::BaseButton; diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 890594d5..c0fe27a 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/bookmark_bubble_view.h" #include "chrome/app/chrome_dll_resource.h" -#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/metrics/user_metrics.h" @@ -21,7 +20,8 @@ #include "chrome/views/checkbox.h" #include "chrome/views/native_button.h" #include "chrome/views/text_field.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" using views::ComboBox; using views::ColumnSet; diff --git a/chrome/browser/views/bookmark_folder_tree_view.cc b/chrome/browser/views/bookmark_folder_tree_view.cc index 29dbceb..3e79ffe 100644 --- a/chrome/browser/views/bookmark_folder_tree_view.cc +++ b/chrome/browser/views/bookmark_folder_tree_view.cc @@ -12,8 +12,7 @@ #include "chrome/common/drag_drop_types.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/view_constants.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" void BookmarkFolderTreeView::DropInfo::Scrolled() { view_->UpdateDropInfo(); diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc index 9241723f..a3e92df 100644 --- a/chrome/browser/views/bookmark_table_view.cc +++ b/chrome/browser/views/bookmark_table_view.cc @@ -17,8 +17,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/view_constants.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index 207ee31..8b57d18 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -6,7 +6,6 @@ #include "base/gfx/rect.h" #include "chrome/app/chrome_dll_resource.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -32,11 +31,11 @@ #include "chrome/views/hwnd_view.h" #include "chrome/views/non_client_view.h" #include "chrome/views/window_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "net/base/net_util.h" -#include "chromium_strings.h" -#include "generated_resources.h" - using base::TimeDelta; namespace views { diff --git a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc index 51d12f7..a114168 100644 --- a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc +++ b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc @@ -15,10 +15,9 @@ #include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui/ui_test.h" #include "chrome/views/event.h" +#include "grit/generated_resources.h" #include "net/base/net_util.h" -#include "generated_resources.h" - class InteractiveConstrainedWindowTest : public UITest { protected: InteractiveConstrainedWindowTest() { diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 9788278..c7835eb 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -8,7 +8,6 @@ #include "base/file_util.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/download/download_util.h" #include "chrome/browser/views/download_shelf_view.h" @@ -20,8 +19,8 @@ #include "chrome/views/native_button.h" #include "chrome/views/root_view.h" #include "chrome/views/widget.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" using base::TimeDelta; diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 7eec963..b3bacde 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -6,7 +6,7 @@ #include <algorithm> -#include "grit/theme_resources.h" +#include "base/logging.h" #include "chrome/browser/browser.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" @@ -16,13 +16,12 @@ #include "chrome/browser/views/download_tab_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" -#include "base/logging.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" #include "chrome/views/button.h" #include "chrome/views/image_view.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" // Max number of download views we'll contain. Any time a view is added and // we already have this many download views, one is removed. diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc index 2ea0cdd..c41cea8 100644 --- a/chrome/browser/views/download_started_animation.cc +++ b/chrome/browser/views/download_started_animation.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/download_started_animation.h" -#include "grit/theme_resources.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/widget_win.h" +#include "grit/theme_resources.h" // How long to spend moving downwards and fading out after waiting. static const int kMoveTimeMs = 600; diff --git a/chrome/browser/views/download_tab_view.cc b/chrome/browser/views/download_tab_view.cc index a033cd1..f4ab642 100644 --- a/chrome/browser/views/download_tab_view.cc +++ b/chrome/browser/views/download_tab_view.cc @@ -14,7 +14,6 @@ #include "base/task.h" #include "base/time_format.h" #include "base/timer.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" @@ -28,7 +27,8 @@ #include "chrome/common/time_format.h" #include "chrome/views/background.h" #include "googleurl/src/gurl.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 7b66208..11d7571 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/edit_keyword_controller.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" @@ -21,8 +20,8 @@ #include "chrome/views/table_view.h" #include "chrome/views/window.h" #include "googleurl/src/gurl.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" using views::GridLayout; using views::ImageView; diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc index 76c1267..c75ccb4 100644 --- a/chrome/browser/views/external_protocol_dialog.cc +++ b/chrome/browser/views/external_protocol_dialog.cc @@ -14,9 +14,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/message_box_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" namespace { diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index 5aa6088..862a10f 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -7,7 +7,6 @@ #include <algorithm> #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/views/find_bar_win.h" #include "chrome/browser/view_ids.h" #include "chrome/common/l10n_util.h" @@ -15,10 +14,10 @@ #include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" #include "chrome/views/label.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "skia/include/SkGradientShader.h" -#include "generated_resources.h" - // The amount of whitespace to have before the find button. static const int kWhiteSpaceAfterMatchCountLabel = 3; diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index 57fdf0a..2d4f68d 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -8,7 +8,6 @@ #include "base/path_service.h" #include "base/ref_counted.h" #include "base/thread.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/first_run.h" @@ -28,9 +27,9 @@ #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/theme_resources.h" FirstRunViewBase::FirstRunViewBase(Profile* profile) : preferred_width_(0), diff --git a/chrome/browser/views/frame/aero_glass_frame.cc b/chrome/browser/views/frame/aero_glass_frame.cc index c6e2017..67d40d2 100644 --- a/chrome/browser/views/frame/aero_glass_frame.cc +++ b/chrome/browser/views/frame/aero_glass_frame.cc @@ -6,12 +6,12 @@ #include <dwmapi.h> -#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/frame/aero_glass_non_client_view.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/window_delegate.h" +#include "grit/theme_resources.h" // static diff --git a/chrome/browser/views/frame/aero_glass_non_client_view.cc b/chrome/browser/views/frame/aero_glass_non_client_view.cc index ed37f7a..f4974be 100644 --- a/chrome/browser/views/frame/aero_glass_non_client_view.cc +++ b/chrome/browser/views/frame/aero_glass_non_client_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/frame/aero_glass_non_client_view.h" -#include "grit/theme_resources.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/client_view.h" #include "chrome/views/window_resources.h" +#include "grit/theme_resources.h" // An enumeration of bitmap resources used by this window. enum { diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 829c294..b2fbe13a 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -9,7 +9,6 @@ #include "base/file_version_info.h" #include "base/time.h" #include "chrome/app/chrome_dll_resource.h" -#include "grit/theme_resources.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" @@ -52,10 +51,10 @@ #include "chrome/views/non_client_view.h" #include "chrome/views/view.h" #include "chrome/views/window.h" - -#include "chromium_strings.h" -#include "generated_resources.h" -#include "webkit_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" +#include "grit/webkit_resources.h" using base::TimeDelta; diff --git a/chrome/browser/views/frame/opaque_non_client_view.cc b/chrome/browser/views/frame/opaque_non_client_view.cc index 8e19e2b..ca2e8bf 100644 --- a/chrome/browser/views/frame/opaque_non_client_view.cc +++ b/chrome/browser/views/frame/opaque_non_client_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/views/frame/opaque_non_client_view.h" -#include "grit/theme_resources.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/gfx/chrome_font.h" @@ -14,8 +13,9 @@ #include "chrome/common/win_util.h" #include "chrome/views/root_view.h" #include "chrome/views/window_resources.h" -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" // An enumeration of bitmap resources used by this window. enum { diff --git a/chrome/browser/views/go_button.cc b/chrome/browser/views/go_button.cc index 47f6175..45ab605 100644 --- a/chrome/browser/views/go_button.cc +++ b/chrome/browser/views/go_button.cc @@ -8,8 +8,7 @@ #include "chrome/browser/command_updater.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/l10n_util.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" GoButton::GoButton(LocationBarView* location_bar, CommandUpdater* command_updater) : ToggleButton(), diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index fa72cc9..a539ea8 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/hung_renderer_view.h" #include "chrome/app/result_codes.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" @@ -24,9 +23,9 @@ #include "chrome/views/image_view.h" #include "chrome/views/label.h" #include "chrome/views/native_button.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" /////////////////////////////////////////////////////////////////////////////// // HungPagesTableModel diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index e41f45c..042d908 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/info_bubble.h" #include "base/win_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/gfx/chrome_canvas.h" @@ -14,6 +13,7 @@ #include "chrome/common/win_util.h" #include "chrome/views/root_view.h" #include "chrome/views/window.h" +#include "grit/theme_resources.h" using views::View; diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index f8dea76..6b7342f 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/infobars/infobars.h" #include "base/message_loop.h" -#include "grit/theme_resources.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" #include "chrome/common/l10n_util.h" @@ -17,8 +16,8 @@ #include "chrome/views/image_view.h" #include "chrome/views/label.h" #include "chrome/views/widget.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" const double kInfoBarHeight = 37.0; diff --git a/chrome/browser/views/input_window.cc b/chrome/browser/views/input_window.cc index 7eafd04..2491321 100644 --- a/chrome/browser/views/input_window.cc +++ b/chrome/browser/views/input_window.cc @@ -10,7 +10,7 @@ #include "chrome/views/label.h" #include "chrome/views/text_field.h" #include "chrome/views/window.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" // Width to make the text field, in pixels. static const int kTextFieldWidth = 200; diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 8d16e89..45b19c63 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -7,7 +7,6 @@ #include "base/path_service.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "grit/theme_resources.h" #include "chrome/browser/alternate_nav_url_fetcher.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" @@ -29,7 +28,8 @@ #include "chrome/views/border.h" #include "chrome/views/root_view.h" #include "chrome/views/widget.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" using views::View; diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc index 9f7e7be..3259307d 100644 --- a/chrome/browser/views/login_view.cc +++ b/chrome/browser/views/login_view.cc @@ -13,8 +13,7 @@ #include "chrome/views/label.h" #include "chrome/views/root_view.h" #include "chrome/views/text_field.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace views { diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index 8bb4460..1d4c2ee 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -19,9 +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" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index b3a728c..ed068b6 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -11,7 +11,6 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/views/options/fonts_languages_window_view.h" @@ -30,7 +29,8 @@ #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 "skia/ext/skia_utils_win.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index ae81849..2d66925 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -8,7 +8,6 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/thread.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" @@ -34,11 +33,11 @@ #include "chrome/views/radio_button.h" #include "chrome/views/table_view.h" #include "chrome/views/text_field.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_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/language_combobox_model.cc b/chrome/browser/views/options/language_combobox_model.cc index 1471fd8..0930fbb 100644 --- a/chrome/browser/views/options/language_combobox_model.cc +++ b/chrome/browser/views/options/language_combobox_model.cc @@ -9,10 +9,9 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/common/l10n_util.h" #include "chrome/common/pref_service.h" +#include "grit/generated_resources.h" #include "unicode/uloc.h" -#include "generated_resources.h" - /////////////////////////////////////////////////////////////////////////////// // LanguageComboboxModel used to populate a combobox with native names // corresponding to the language code (e.g. English (United States) for en-US) diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 0252d7d..be7e81f 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -12,7 +12,6 @@ #include "base/string_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/spellchecker.h" @@ -34,12 +33,12 @@ #include "chrome/views/tabbed_pane.h" #include "chrome/views/text_field.h" #include "chrome/views/widget.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" #include "unicode/uloc.h" -#include "chromium_strings.h" -#include "generated_resources.h" - static const wchar_t* const accept_language_list[] = { L"af", // Afrikaans L"am", // Amharic diff --git a/chrome/browser/views/password_manager_exceptions_view.cc b/chrome/browser/views/password_manager_exceptions_view.cc index b12d471..9d41a85 100644 --- a/chrome/browser/views/password_manager_exceptions_view.cc +++ b/chrome/browser/views/password_manager_exceptions_view.cc @@ -12,8 +12,7 @@ #include "chrome/views/background.h" #include "chrome/views/grid_layout.h" #include "chrome/views/native_button.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/password_manager_view.cc b/chrome/browser/views/password_manager_view.cc index 15e5771..644e09f 100644 --- a/chrome/browser/views/password_manager_view.cc +++ b/chrome/browser/views/password_manager_view.cc @@ -12,8 +12,7 @@ #include "chrome/views/background.h" #include "chrome/views/grid_layout.h" #include "chrome/views/native_button.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" using views::ColumnSet; using views::GridLayout; diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc index 87d90c9..070e130 100644 --- a/chrome/browser/views/repost_form_warning_view.cc +++ b/chrome/browser/views/repost_form_warning_view.cc @@ -10,8 +10,7 @@ #include "chrome/common/notification_service.h" #include "chrome/views/message_box_view.h" #include "chrome/views/window.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" // Implementation of function declared in // browser/tab_contents/repost_form_warning.h diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc index 596e16b..05fa894 100644 --- a/chrome/browser/views/restart_message_box.cc +++ b/chrome/browser/views/restart_message_box.cc @@ -7,9 +7,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/message_box_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" //////////////////////////////////////////////////////////////////////////////// // RestartMessageBox, public: diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 0eb5104..ca30aca 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -5,11 +5,11 @@ #include "chrome/browser/views/sad_tab_view.h" #include "base/gfx/size.h" -#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" #include "skia/include/SkGradientShader.h" diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index a7720c7..ed50ca7 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -20,7 +20,7 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" class ShellDialogThread : public base::Thread { public: diff --git a/chrome/browser/views/star_toggle.cc b/chrome/browser/views/star_toggle.cc index 6e16653..83239e6 100644 --- a/chrome/browser/views/star_toggle.cc +++ b/chrome/browser/views/star_toggle.cc @@ -5,9 +5,9 @@ #include "chrome/browser/views/star_toggle.h" #include "chrome/app/chrome_dll_resource.h" -#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" +#include "grit/theme_resources.h" StarToggle::StarToggle(Delegate* delegate) : delegate_(delegate), diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index 31ae020..816677d 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -8,7 +8,6 @@ #include "base/scoped_ptr.h" #include "base/string_util.h" -#include "grit/theme_resources.h" #include "chrome/common/animation.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" @@ -18,13 +17,13 @@ #include "chrome/views/root_view.h" #include "chrome/views/widget_win.h" #include "googleurl/src/gurl.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "net/base/net_util.h" #include "SkPaint.h" #include "SkPath.h" #include "SkRect.h" -#include "generated_resources.h" - // The color of the background bubble. static const SkColor kBubbleColor = SkColorSetRGB(222, 234, 248); diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 61723fac..51db9bf 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -9,13 +9,13 @@ #include "base/file_util.h" #include "base/path_service.h" -#include "grit/theme_resources.h" +#include "chrome/app/chrome_dll_resource.h" +#include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/common/resource_bundle.h" -#include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/app/chrome_dll_resource.h" +#include "grit/theme_resources.h" static bool g_initialized = false; static SkBitmap* g_default_fav_icon = NULL; diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index 576a84f..fdd6b65 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -12,7 +12,7 @@ #include "chrome/views/chrome_menu.h" #include "chrome/views/tooltip_manager.h" #include "chrome/views/widget.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" const std::string Tab::kTabClassName = "browser/tabs/Tab"; diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 84a68ad..cc7cf4c 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,7 +6,6 @@ #include "chrome/browser/views/tabs/tab_renderer.h" -#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -16,7 +15,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "skia/ext/image_operations.h" static const int kLeftPadding = 16; diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index b8ad705..fceb5af 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -5,7 +5,6 @@ #include "chrome/browser/views/tabs/tab_strip.h" #include "base/gfx/size.h" -#include "grit/theme_resources.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -26,8 +25,8 @@ #include "chrome/common/win_util.h" #include "chrome/views/image_view.h" #include "chrome/views/painter.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #undef min #undef max diff --git a/chrome/browser/views/toolbar_star_toggle.cc b/chrome/browser/views/toolbar_star_toggle.cc index 420605c..acc5a9e 100644 --- a/chrome/browser/views/toolbar_star_toggle.cc +++ b/chrome/browser/views/toolbar_star_toggle.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/toolbar_star_toggle.h" -#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" #include "chrome/browser/views/bookmark_bubble_view.h" #include "chrome/browser/views/toolbar_view.h" #include "chrome/common/resource_bundle.h" #include "googleurl/src/gurl.h" +#include "grit/theme_resources.h" using base::TimeTicks; diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index bf65185..16f6a69 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -9,7 +9,6 @@ #include "base/logging.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" -#include "grit/theme_resources.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser.h" @@ -46,11 +45,11 @@ #include "chrome/views/non_client_view.h" #include "chrome/views/tooltip_manager.h" #include "chrome/views/widget.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" #include "net/base/net_util.h" -#include "chromium_strings.h" -#include "generated_resources.h" - static const int kControlHorizOffset = 4; static const int kControlVertOffset = 6; static const int kControlIndent = 3; diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc index ec0c535..901c86b 100644 --- a/chrome/browser/views/user_data_dir_dialog.cc +++ b/chrome/browser/views/user_data_dir_dialog.cc @@ -7,9 +7,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/message_box_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" // static std::wstring UserDataDirDialog::RunUserDataDirDialog( diff --git a/chrome/chrome.xcodeproj/generate_headers.sh b/chrome/chrome.xcodeproj/generate_headers.sh index 27a6863..cdd54db 100755 --- a/chrome/chrome.xcodeproj/generate_headers.sh +++ b/chrome/chrome.xcodeproj/generate_headers.sh @@ -11,7 +11,7 @@ mkdir -p "${GRIT_DIR}" # compare generated_resources.grd to generated_resources.h. If the .h is # older or doesn't exist, rebuild it. -if [ "${GRIT_DIR}/generated_resources.h" -ot \ +if [ "${GRIT_DIR}/grit/generated_resources.h" -ot \ "${PROJECT_DIR}/app/generated_resources.grd" ] then python "${PROJECT_DIR}/../tools/grit/grit.py" \ @@ -21,7 +21,7 @@ fi # compare chromium_strings.grd to chromium_strings.h. If the .h is # older or doesn't exist, rebuild it -if [ "${GRIT_DIR}/chromium_strings.h" -ot \ +if [ "${GRIT_DIR}/grit/chromium_strings.h" -ot \ "${PROJECT_DIR}/app/chromium_strings.grd" ] then python "${PROJECT_DIR}/../tools/grit/grit.py" \ @@ -31,7 +31,7 @@ fi # compare browser_resources.grd to browser_resources.h. If the .h is # older or doesn't exist, rebuild it -if [ "${GRIT_DIR}/browser_resources.h" -ot \ +if [ "${GRIT_DIR}/grit/browser_resources.h" -ot \ "${PROJECT_DIR}/browser/browser_resources.grd" ] then python "${PROJECT_DIR}/../tools/grit/grit.py" \ diff --git a/chrome/common/child_process_info.cc b/chrome/common/child_process_info.cc index cc35429..f1c91c7 100644 --- a/chrome/common/child_process_info.cc +++ b/chrome/common/child_process_info.cc @@ -11,8 +11,7 @@ #include "base/rand_util.h" #include "base/string_util.h" #include "chrome/common/l10n_util.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" std::wstring ChildProcessInfo::GetTypeNameInEnglish( ChildProcessInfo::ProcessType type) { diff --git a/chrome/common/os_exchange_data.cc b/chrome/common/os_exchange_data.cc index e86ce33..26e4b35 100644 --- a/chrome/common/os_exchange_data.cc +++ b/chrome/common/os_exchange_data.cc @@ -12,12 +12,12 @@ #include "base/pickle.h" #include "base/scoped_handle.h" #include "base/string_util.h" -#include "net/base/net_util.h" #include "chrome/common/l10n_util.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/win_util.h" #include "googleurl/src/gurl.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "net/base/net_util.h" // Creates a new STGMEDIUM object to hold the specified text. The caller // owns the resulting object. The "Bytes" version does not NULL terminate, the diff --git a/chrome/common/pref_service.cc b/chrome/common/pref_service.cc index 1da274d..ebc9452 100644 --- a/chrome/common/pref_service.cc +++ b/chrome/common/pref_service.cc @@ -15,8 +15,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/stl_util-inl.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc index 94adb8e..aef72ebb 100644 --- a/chrome/common/security_filter_peer.cc +++ b/chrome/common/security_filter_peer.cc @@ -7,17 +7,17 @@ #include "base/gfx/png_encoder.h" #include "base/gfx/size.h" #include "base/string_util.h" -#include "net/base/net_errors.h" -#include "net/http/http_response_headers.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/renderer_resources.h" +#include "net/base/net_errors.h" +#include "net/http/http_response_headers.h" #include "skia/include/SkBitmap.h" #include "skia/include/SkCanvas.h" #include "webkit/glue/webkit_glue.h" #include "SkDevice.h" -#include "grit/renderer_resources.h" SecurityFilterPeer::SecurityFilterPeer( webkit_glue::ResourceLoaderBridge* resource_loader_bridge, diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index 70fe12c..f3f6778 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -14,7 +14,7 @@ #include "base/time_format.h" #include "chrome/common/l10n_util.h" #include "chrome/common/stl_util-inl.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" #include "unicode/datefmt.h" #include "unicode/locid.h" #include "unicode/plurfmt.h" diff --git a/chrome/common/win_util.cc b/chrome/common/win_util.cc index 8442bb0..7437031 100644 --- a/chrome/common/win_util.cc +++ b/chrome/common/win_util.cc @@ -20,8 +20,8 @@ #include "base/string_util.h" #include "base/win_util.h" #include "chrome/common/l10n_util.h" +#include "grit/generated_resources.h" #include "net/base/mime_util.h" -#include "generated_resources.h" // Ensure that we pick up this link library. #pragma comment(lib, "dwmapi.lib") diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index ef9e5af..af89563 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -9,13 +9,12 @@ #include "base/values.h" #include "chrome/common/l10n_util.h" #include "googleurl/src/gurl.h" +#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "webkit/glue/weberror.h" #include "webkit/glue/webkit_glue.h" -#include "generated_resources.h" - namespace { static const char* kRedirectLoopLearnMoreUrl = diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index d87b327..4a5f360 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -32,6 +32,8 @@ #include "chrome/renderer/visitedlink_slave.h" #include "chrome/renderer/webmediaplayer_delegate_impl.h" #include "chrome/renderer/webplugin_delegate_proxy.h" +#include "grit/generated_resources.h" +#include "grit/renderer_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "skia/ext/bitmap_platform_device.h" @@ -56,9 +58,6 @@ #include "webkit/glue/weburlrequest.h" #include "webkit/glue/webview.h" -#include "generated_resources.h" -#include "grit/renderer_resources.h" - #if defined(OS_WIN) // TODO(port): these files are currently Windows only because they concern: // * plugins diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc index 8ca5346..b79e9e5 100644 --- a/chrome/renderer/renderer_main.cc +++ b/chrome/renderer/renderer_main.cc @@ -18,14 +18,13 @@ #include "chrome/common/resource_bundle.h" #include "chrome/renderer/renderer_main_platform_delegate.h" #include "chrome/renderer/render_process.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" #if defined(OS_LINUX) #include <gtk/gtk.h> #endif -#include "chromium_strings.h" -#include "generated_resources.h" - // This function provides some ways to test crash and assertion handling // behavior of the renderer. static void HandleRendererErrorTestParameters(const CommandLine& command_line) { diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 0e63b57..cb18ed6 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -6,14 +6,11 @@ #include <atlbase.h> -#include "generated_resources.h" - #include "base/logging.h" #include "base/ref_counted.h" #include "base/string_util.h" #include "base/gfx/size.h" #include "base/gfx/native_widget_types.h" - #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/emf.h" @@ -27,6 +24,7 @@ #include "chrome/renderer/render_thread.h" #include "chrome/renderer/render_view.h" #include "googleurl/src/gurl.h" +#include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webframe.h" diff --git a/chrome/test/DEPS b/chrome/test/DEPS index fdb76c3..2d48d5d 100644 --- a/chrome/test/DEPS +++ b/chrome/test/DEPS @@ -1,6 +1,7 @@ include_rules = [ # The test directory can do whatever it wants in chrome. "+chrome", + "+grit", # For generated headers "+sandbox/src", "+sandbox/tests", "+webkit/glue", diff --git a/chrome/test/accessibility/accessibility_tests.cc b/chrome/test/accessibility/accessibility_tests.cc index 44ad3c7..4ff6179 100644 --- a/chrome/test/accessibility/accessibility_tests.cc +++ b/chrome/test/accessibility/accessibility_tests.cc @@ -13,11 +13,10 @@ #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/window_proxy.h" #include "chrome/test/automation/tab_proxy.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" #include "net/base/net_util.h" -#include "chromium_strings.h" -#include "generated_resources.h" - namespace { #define CHK_RELEASE(obj) { if (obj) { (obj)->Release(); (obj) = NULL; } } diff --git a/chrome/test/accessibility/accessibility_util.cc b/chrome/test/accessibility/accessibility_util.cc index 9d4afbb..aa9fd2c 100644 --- a/chrome/test/accessibility/accessibility_util.cc +++ b/chrome/test/accessibility/accessibility_util.cc @@ -8,9 +8,8 @@ #include "chrome/browser/view_ids.h" #include "chrome/common/l10n_util.h" #include "chrome/test/accessibility/constants.h" - -#include "chromium_strings.h" -#include "generated_resources.h" +#include "grit/chromium_strings.h" +#include "grit/generated_resources.h" VARIANT id_self = {VT_I4, CHILDID_SELF}; diff --git a/chrome/views/accelerator.cc b/chrome/views/accelerator.cc index dfba1b0..8619394 100644 --- a/chrome/views/accelerator.cc +++ b/chrome/views/accelerator.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "base/string_util.h" #include "chrome/common/l10n_util.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace views { diff --git a/chrome/views/bitmap_scroll_bar.cc b/chrome/views/bitmap_scroll_bar.cc index 54b4f28..6239fc0 100644 --- a/chrome/views/bitmap_scroll_bar.cc +++ b/chrome/views/bitmap_scroll_bar.cc @@ -10,10 +10,9 @@ #include "chrome/views/menu.h" #include "chrome/views/scroll_view.h" #include "chrome/views/widget.h" +#include "grit/generated_resources.h" #include "skia/include/SkBitmap.h" -#include "generated_resources.h" - #undef min #undef max diff --git a/chrome/views/button.cc b/chrome/views/button.cc index 36c228a..3c675d5 100644 --- a/chrome/views/button.cc +++ b/chrome/views/button.cc @@ -12,10 +12,9 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/throb_animation.h" #include "chrome/views/event.h" +#include "grit/generated_resources.h" #include "skia/ext/image_operations.h" -#include "generated_resources.h" - namespace views { static const int kDefaultWidth = 16; // Default button width if no theme. diff --git a/chrome/views/button_dropdown.cc b/chrome/views/button_dropdown.cc index 5eb553e..6c587ae 100644 --- a/chrome/views/button_dropdown.cc +++ b/chrome/views/button_dropdown.cc @@ -9,8 +9,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/view_menu_delegate.h" #include "chrome/views/widget.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace views { diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc index d7d6618..f226987 100644 --- a/chrome/views/chrome_menu.cc +++ b/chrome/views/chrome_menu.cc @@ -23,7 +23,7 @@ #include "chrome/views/root_view.h" #include "chrome/views/view_constants.h" #include "chrome/views/widget_win.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" #undef min diff --git a/chrome/views/custom_frame_window.cc b/chrome/views/custom_frame_window.cc index 4e57ee0..79ce069 100644 --- a/chrome/views/custom_frame_window.cc +++ b/chrome/views/custom_frame_window.cc @@ -7,7 +7,6 @@ #include "base/gfx/point.h" #include "base/gfx/size.h" #include "base/win_util.h" -#include "grit/theme_resources.h" #include "chrome/common/gfx/path.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" @@ -21,7 +20,8 @@ #include "chrome/views/root_view.h" #include "chrome/views/window_delegate.h" #include "chrome/views/window_resources.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" namespace views { diff --git a/chrome/views/dialog_client_view.cc b/chrome/views/dialog_client_view.cc index fc37321..58618b2 100644 --- a/chrome/views/dialog_client_view.cc +++ b/chrome/views/dialog_client_view.cc @@ -17,7 +17,7 @@ #include "chrome/common/win_util.h" #include "chrome/views/dialog_delegate.h" #include "chrome/views/window.h" -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace views { diff --git a/chrome/views/menu_button.cc b/chrome/views/menu_button.cc index ff0400a..ad8ace1 100644 --- a/chrome/views/menu_button.cc +++ b/chrome/views/menu_button.cc @@ -7,7 +7,6 @@ #include "chrome/views/menu_button.h" -#include "grit/theme_resources.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" @@ -18,8 +17,8 @@ #include "chrome/views/root_view.h" #include "chrome/views/view_menu_delegate.h" #include "chrome/views/widget.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" using base::Time; using base::TimeDelta; diff --git a/chrome/views/message_box_view.cc b/chrome/views/message_box_view.cc index 6851ed4..818cf50 100644 --- a/chrome/views/message_box_view.cc +++ b/chrome/views/message_box_view.cc @@ -10,8 +10,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/checkbox.h" #include "chrome/views/client_view.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" static const int kDefaultMessageWidth = 320; diff --git a/chrome/views/scroll_view.cc b/chrome/views/scroll_view.cc index cb40f74..e30e68d 100644 --- a/chrome/views/scroll_view.cc +++ b/chrome/views/scroll_view.cc @@ -5,10 +5,10 @@ #include "chrome/views/scroll_view.h" #include "base/logging.h" -#include "grit/theme_resources.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/native_scroll_bar.h" #include "chrome/views/root_view.h" +#include "grit/theme_resources.h" namespace views { diff --git a/chrome/views/text_button.cc b/chrome/views/text_button.cc index 1e98f7a..f185745 100644 --- a/chrome/views/text_button.cc +++ b/chrome/views/text_button.cc @@ -4,7 +4,6 @@ #include "chrome/views/text_button.h" -#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/throb_animation.h" @@ -12,8 +11,8 @@ #include "chrome/views/button.h" #include "chrome/views/event.h" #include "chrome/views/view_menu_delegate.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" +#include "grit/theme_resources.h" namespace views { diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc index dc1b66c..deeed6e 100644 --- a/chrome/views/text_field.cc +++ b/chrome/views/text_field.cc @@ -24,10 +24,9 @@ #include "chrome/views/hwnd_view.h" #include "chrome/views/menu.h" #include "chrome/views/widget.h" +#include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" -#include "generated_resources.h" - using gfx::NativeTheme; namespace views { diff --git a/chrome/views/throbber.cc b/chrome/views/throbber.cc index 4b01198..1f80ff4 100644 --- a/chrome/views/throbber.cc +++ b/chrome/views/throbber.cc @@ -5,10 +5,10 @@ #include "chrome/views/throbber.h" #include "base/time.h" -#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/resource_bundle.h" +#include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" using base::Time; diff --git a/chrome/views/tree_view.cc b/chrome/views/tree_view.cc index dbd0c75..a9229c8 100644 --- a/chrome/views/tree_view.cc +++ b/chrome/views/tree_view.cc @@ -7,7 +7,6 @@ #include <shellapi.h> #include "base/win_util.h" -#include "grit/theme_resources.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/common/l10n_util.h" @@ -15,6 +14,7 @@ #include "chrome/common/stl_util-inl.h" #include "chrome/views/focus_manager.h" #include "chrome/views/widget.h" +#include "grit/theme_resources.h" namespace views { diff --git a/chrome/views/window.cc b/chrome/views/window.cc index 84662a9..1b74a41 100644 --- a/chrome/views/window.cc +++ b/chrome/views/window.cc @@ -18,8 +18,7 @@ #include "chrome/views/non_client_view.h" #include "chrome/views/root_view.h" #include "chrome/views/window_delegate.h" - -#include "generated_resources.h" +#include "grit/generated_resources.h" namespace views { diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 3158f46..a1b4b73 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -44,7 +44,7 @@ #include "unicode/datefmt.h" #if !defined(OS_MACOSX) -#include "net_resources.h" +#include "grit/net_resources.h" #endif using base::Time; diff --git a/tools/grit/build/grit_localized_resources.rules b/tools/grit/build/grit_localized_resources.rules index ca48791..4faa7fc 100644 --- a/tools/grit/build/grit_localized_resources.rules +++ b/tools/grit/build/grit_localized_resources.rules @@ -8,7 +8,7 @@ Name="GRIT Generated Localized Resources" DisplayName="GRIT Generated Localized Resources" CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] "$(SolutionDir)" "$(OutDir)\grit_derived_sources" [AllOptions]" - Outputs="$(OutDir)\grit_derived_sources\$(InputName).h; + Outputs="$(OutDir)\grit_derived_sources\grit\$(InputName).h; $(OutDir)\grit_derived_sources\$(InputName)_ar.rc; $(OutDir)\grit_derived_sources\$(InputName)_bg.rc; $(OutDir)\grit_derived_sources\$(InputName)_bn.rc; diff --git a/tools/grit/build/grit_resources.rules b/tools/grit/build/grit_resources.rules index d686fed..e81f87e 100644 --- a/tools/grit/build/grit_resources.rules +++ b/tools/grit/build/grit_resources.rules @@ -8,7 +8,7 @@ Name="GRIT Generated Resources" DisplayName="GRIT Generated Resources" CommandLine="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat [inputs] "$(SolutionDir)" "$(OutDir)\grit_derived_sources" [AllOptions]" - Outputs="$(OutDir)\grit_derived_sources\$(InputName).h" + Outputs="$(OutDir)\grit_derived_sources\grit\$(InputName).h" AdditionalDependencies="$(SolutionDir)..\tools\grit\build\grit_resource_file.bat;$(SolutionDir)..\tools\grit\grit.py" FileExtensions="*.grd" ExecutionDescription="Generating resources..." diff --git a/webkit/DEPS b/webkit/DEPS index 120eb9f..99b96ac 100644 --- a/webkit/DEPS +++ b/webkit/DEPS @@ -9,6 +9,7 @@ skip_child_includes = [ include_rules = [ # For bridge/c/c_utility.h in npruntime_util.cc "+bridge", + "+grit", # For generated headers # TODO(brettw) - review these; move up if it's ok, or remove the dependency "+net/base", diff --git a/webkit/default_plugin/install_dialog.cc b/webkit/default_plugin/install_dialog.cc index 95f2795..590742b 100644 --- a/webkit/default_plugin/install_dialog.cc +++ b/webkit/default_plugin/install_dialog.cc @@ -6,13 +6,9 @@ #include "base/logging.h" #include "base/string_util.h" +#include "grit/webkit_strings.h" #include "webkit/default_plugin/plugin_impl.h" #include "webkit/glue/webkit_glue.h" -// This file is generated when the webkit_strings.grd file is compiled -// It is generated under chrome/webkit/<debug\release>/obj/localized_strings -// folder. This path is added to the include path in the associated vsprops -// file. -#include "webkit_strings.h" bool PluginInstallDialog::Initialize(PluginInstallerImpl* plugin_impl, const std::wstring& plugin_name) { diff --git a/webkit/default_plugin/plugin_impl_win.cc b/webkit/default_plugin/plugin_impl_win.cc index 7894363..d3cbdaa 100644 --- a/webkit/default_plugin/plugin_impl_win.cc +++ b/webkit/default_plugin/plugin_impl_win.cc @@ -11,6 +11,7 @@ #include "base/string_util.h" #include "base/time.h" #include "googleurl/src/gurl.h" +#include "grit/webkit_strings.h" #include "unicode/locid.h" #include "webkit/default_plugin/activex_installer.h" #include "webkit/activex_shim/activex_shared.h" @@ -18,11 +19,6 @@ #include "webkit/default_plugin/default_plugin_shared.h" #include "webkit/default_plugin/plugin_main.h" #include "webkit/glue/webkit_glue.h" -// This file is generated when the webkit_strings.grd file is compiled. -// The path is the chrome/webkit/<debug\release>/obj/localized_strings -// folder. This path is added to the include path in the associated vsprops -// file. -#include "webkit_strings.h" static const int TOOLTIP_MAX_WIDTH = 500; diff --git a/webkit/glue/chromium_bridge_impl.cc b/webkit/glue/chromium_bridge_impl.cc index fe2582e..73b6c05 100644 --- a/webkit/glue/chromium_bridge_impl.cc +++ b/webkit/glue/chromium_bridge_impl.cc @@ -41,6 +41,7 @@ #if USE(V8) #include <v8.h> #endif +#include "grit/webkit_resources.h" #include "webkit/glue/chrome_client_impl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/plugins/plugin_instance.h" @@ -51,9 +52,6 @@ #include "webkit/glue/webview_impl.h" #include "webkit/glue/webview_delegate.h" -// Generated by GRIT -#include "webkit_resources.h" - #if defined(OS_WIN) #include <windows.h> #include <vssym32.h> diff --git a/webkit/glue/feed_preview.cc b/webkit/glue/feed_preview.cc index f14753a..7537f6d 100644 --- a/webkit/glue/feed_preview.cc +++ b/webkit/glue/feed_preview.cc @@ -16,13 +16,11 @@ MSVC_POP_WARNING(); #undef LOG #include "base/logging.h" +#include "grit/webkit_resources.h" #include "googleurl/src/gurl.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" -// Generated by GRIT -#include "webkit_resources.h" - namespace WebCore { // Generate a preview for a feed. |url| is the (http://) URL of the feed, diff --git a/webkit/glue/localized_strings.cc b/webkit/glue/localized_strings.cc index 148252a..9a508b7 100644 --- a/webkit/glue/localized_strings.cc +++ b/webkit/glue/localized_strings.cc @@ -34,11 +34,10 @@ #include "base/file_util.h" #include "base/string16.h" #include "base/string_util.h" -#include "build/build_config.h" +#include "grit/webkit_strings.h" #include "webkit/glue/glue_util.h" #include "webkit/glue/webkit_glue.h" -#include "webkit_strings.h" using namespace WebCore; diff --git a/webkit/glue/webcursor_win.cc b/webkit/glue/webcursor_win.cc index 60e7561..2c6e275 100644 --- a/webkit/glue/webcursor_win.cc +++ b/webkit/glue/webcursor_win.cc @@ -10,12 +10,10 @@ #include "base/gfx/gdi_util.h" #include "base/logging.h" #include "base/pickle.h" +#include "grit/webkit_resources.h" #include "skia/include/SkBitmap.h" #include "webkit/glue/webcursor.h" -// Generated by GRIT -#include "webkit_resources.h" - using WebCore::PlatformCursor; static LPCWSTR ToCursorID(PlatformCursor::Type type) { diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index f40dcbd..086c305 100755 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -25,6 +25,7 @@ #include "base/string_util.h" #include "build/build_config.h" #include "googleurl/src/url_util.h" +#include "grit/webkit_strings.h" #include "net/base/mime_util.h" #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_filter.h" @@ -40,7 +41,6 @@ #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" #include "webkit/tools/test_shell/test_navigation_controller.h" #include "webkit/tools/test_shell/test_shell_switches.h" -#include "webkit_strings.h" #include "SkBitmap.h" diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 57dc592..9968fa6 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -22,6 +22,7 @@ #include "base/trace_event.h" #include "base/win_util.h" #include "breakpad/src/client/windows/handler/exception_handler.h" +#include "grit/webkit_resources.h" #include "net/base/net_module.h" #include "net/http/http_network_layer.h" #include "net/url_request/url_request_file_job.h" @@ -36,9 +37,6 @@ #include "webkit/tools/test_shell/test_navigation_controller.h" #include "webkit/tools/test_shell/test_shell_switches.h" -// Generated by GRIT -#include "webkit_resources.h" - #define MAX_LOADSTRING 100 #define BUTTON_WIDTH 72 diff --git a/webkit/webkit.xcodeproj/glue_prebuild.sh b/webkit/webkit.xcodeproj/glue_prebuild.sh index fd56984..63379cc 100755 --- a/webkit/webkit.xcodeproj/glue_prebuild.sh +++ b/webkit/webkit.xcodeproj/glue_prebuild.sh @@ -11,7 +11,7 @@ mkdir -p "${GRIT_DIR}" # compare webkit_strings.grd to webkit_strings.h. If the .h is # older or doesn't exist, rebuild it. -if [ "${GRIT_DIR}/webkit_strings.h" -ot \ +if [ "${GRIT_DIR}/grit/webkit_strings.h" -ot \ "${PROJECT_DIR}/glue/webkit_strings.grd" ] then python "${PROJECT_DIR}/../tools/grit/grit.py" \ @@ -19,7 +19,7 @@ then -o "${GRIT_DIR}" fi -if [ "${GRIT_DIR}/webkit_resources.h" -ot \ +if [ "${GRIT_DIR}/grit/webkit_resources.h" -ot \ "${PROJECT_DIR}/glue/webkit_resources.grd" ] then python "${PROJECT_DIR}/../tools/grit/grit.py" \ |