diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 02:05:11 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-05 02:05:11 +0000 |
| commit | 9929da90886e2df0c91810766cf09b4b110218c6 (patch) | |
| tree | e94f246a0c6305e7d2f9e594d0c73191fe5ac3b1 /chrome/browser | |
| parent | 58956203f3268d5b4642a8ad586fdd66ad7d9375 (diff) | |
| download | chromium_src-9929da90886e2df0c91810766cf09b4b110218c6.zip chromium_src-9929da90886e2df0c91810766cf09b4b110218c6.tar.gz chromium_src-9929da90886e2df0c91810766cf09b4b110218c6.tar.bz2 | |
Adds toplevel app/ directory and moves ResourceBundle into it.
No changes to resource bundle yet, just the move to keep this CL as compact as possible.
Adds new vcproj and gyp file for app dir.
http://crbug.com/11387
Review URL: http://codereview.chromium.org/100354
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
96 files changed, 110 insertions, 112 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index b134e1b..452c4c6 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -4,12 +4,12 @@ #include "chrome/browser/alternate_nav_url_fetcher.h" +#include "app/resource_bundle.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" -#include "chrome/common/resource_bundle.h" #include "grit/generated_resources.h" AlternateNavURLFetcher::AlternateNavURLFetcher( diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc index 656907a..70e13052 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc @@ -8,6 +8,7 @@ #include <algorithm> +#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/gfx/gtk_util.h" #include "base/gfx/rect.h" @@ -22,7 +23,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/notification_service.h" -#include "chrome/common/resource_bundle.h" #include "grit/theme_resources.h" namespace { @@ -256,13 +256,13 @@ AutocompletePopupViewGtk::AutocompletePopupViewGtk( GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - g_signal_connect(window_, "motion-notify-event", + g_signal_connect(window_, "motion-notify-event", G_CALLBACK(&HandleMotionThunk), this); - g_signal_connect(window_, "button-press-event", + g_signal_connect(window_, "button-press-event", G_CALLBACK(&HandleButtonPressThunk), this); - g_signal_connect(window_, "button-release-event", + g_signal_connect(window_, "button-release-event", G_CALLBACK(&HandleButtonReleaseThunk), this); - g_signal_connect(window_, "expose-event", + g_signal_connect(window_, "expose-event", G_CALLBACK(&HandleExposeThunk), this); } diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc index 268d4cd..82988718 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc @@ -11,6 +11,7 @@ #include <atlmisc.h> #include <cmath> +#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/string_util.h" #include "base/win_util.h" @@ -29,7 +30,6 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/view.h" #include "grit/theme_resources.h" #include "third_party/icu38/public/common/unicode/ubidi.h" diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc index de09b13..d86d52f 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc @@ -4,8 +4,8 @@ #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" +#include "app/resource_bundle.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_menu_controller.cc b/chrome/browser/bookmarks/bookmark_menu_controller.cc index 53f2007..0fcaa98d6 100644 --- a/chrome/browser/bookmarks/bookmark_menu_controller.cc +++ b/chrome/browser/bookmarks/bookmark_menu_controller.cc @@ -4,6 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_menu_controller.h" +#include "app/resource_bundle.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/metrics/user_metrics.h" @@ -13,7 +14,6 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/common/l10n_util.h" #include "chrome/common/page_transition_types.h" -#include "chrome/common/resource_bundle.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc index 2f294b1..24e0d53 100644 --- a/chrome/browser/bookmarks/bookmark_table_model.cc +++ b/chrome/browser/bookmarks/bookmark_table_model.cc @@ -6,11 +6,11 @@ #include <limits> +#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.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 "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 8c34b3f..9321958 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -7,6 +7,7 @@ #include <string> #include <vector> +#include "app/resource_bundle.h" #include "base/file_version_info.h" #include "base/histogram.h" #include "base/platform_thread.h" @@ -27,7 +28,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/render_messages.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #include "chrome/renderer/about_handler.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 8adb962..00d265d 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -4,6 +4,7 @@ #include "chrome/browser/browser_init.h" +#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/event_recorder.h" @@ -37,7 +38,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -140,8 +140,8 @@ class NotifyNotDefaultBrowserTask : public Task { } TabContents* tab = browser->GetSelectedTabContents(); // Don't show the info-bar if there are already info-bars showing. - // In ChromeBot tests, there might be a race. This line appears to get - // called during shutdown and |tab| can be NULL. + // In ChromeBot tests, there might be a race. This line appears to get + // called during shutdown and |tab| can be NULL. if (!tab || tab->infobar_delegate_count() > 0) return; tab->AddInfoBar(new DefaultBrowserInfoBarDelegate(tab)); diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index 6b27a9d..0588bf5d 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/field_trial.h" #include "base/file_util.h" @@ -45,7 +46,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/result_codes.h" -#include "chrome/common/resource_bundle.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/net_resources.h" diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index c37a975..8ef0dbe 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -4,6 +4,7 @@ #include "chrome/browser/browser_shutdown.h" +#include "app/resource_bundle.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/histogram.h" @@ -25,7 +26,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/chrome_plugin_lib.h" -#include "chrome/common/resource_bundle.h" #include "net/dns_global.h" diff --git a/chrome/browser/debugger/debugger_shell.cc b/chrome/browser/debugger/debugger_shell.cc index fc89a94..d6d5324 100644 --- a/chrome/browser/debugger/debugger_shell.cc +++ b/chrome/browser/debugger/debugger_shell.cc @@ -6,6 +6,7 @@ #include "build/build_config.h" +#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" @@ -18,7 +19,6 @@ #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/resource_bundle.h" #include "grit/debugger_resources.h" diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc index bf3dc09..003e3d2 100644 --- a/chrome/browser/debugger/debugger_view.cc +++ b/chrome/browser/debugger/debugger_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/debugger/debugger_view.h" +#include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" #include "base/json_writer.h" @@ -20,7 +21,6 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/views/tab_contents_container_view.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/scrollbar/native_scroll_bar.h" #include "chrome/views/controls/scroll_view.h" @@ -162,4 +162,3 @@ bool DebuggerView::AcceleratorPressed(const views::Accelerator& accelerator) { window_->window()->Close(); return true; } - diff --git a/chrome/browser/dom_ui/debugger_ui.cc b/chrome/browser/dom_ui/debugger_ui.cc index c20286a..7467571 100644 --- a/chrome/browser/dom_ui/debugger_ui.cc +++ b/chrome/browser/dom_ui/debugger_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/dom_ui/debugger_ui.h" +#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/string_util.h" @@ -13,7 +14,6 @@ #include "chrome/browser/debugger/debugger_wrapper.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #include "net/base/mime_util.h" diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.cc b/chrome/browser/dom_ui/dom_ui_favicon_source.cc index d9ba79e..233bd83 100644 --- a/chrome/browser/dom_ui/dom_ui_favicon_source.cc +++ b/chrome/browser/dom_ui/dom_ui_favicon_source.cc @@ -4,8 +4,8 @@ #include "chrome/browser/dom_ui/dom_ui_favicon_source.h" +#include "app/resource_bundle.h" #include "chrome/browser/profile.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #include "grit/theme_resources.h" @@ -60,4 +60,3 @@ void DOMUIFavIconSource::OnFavIconDataAvailable( SendResponse(request_id, default_favicon_); } } - diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc index 45b4bf3..df9c675 100644 --- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc +++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.cc @@ -4,8 +4,8 @@ #include "chrome/browser/dom_ui/dom_ui_thumbnail_source.h" +#include "app/resource_bundle.h" #include "chrome/browser/profile.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "grit/theme_resources.h" @@ -50,4 +50,3 @@ void DOMUIThumbnailSource::OnThumbnailDataAvailable( SendResponse(request_id, default_thumbnail_); } } - diff --git a/chrome/browser/dom_ui/fileicon_source.h b/chrome/browser/dom_ui/fileicon_source.h index 4da8c41..423efcb 100644 --- a/chrome/browser/dom_ui/fileicon_source.h +++ b/chrome/browser/dom_ui/fileicon_source.h @@ -5,8 +5,8 @@ #ifndef CHROME_BROWSER_DOM_UI_FILEICON_SOURCE_H_ #define CHROME_BROWSER_DOM_UI_FILEICON_SOURCE_H_ +#include "app/resource_bundle.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "chrome/common/resource_bundle.h" #if defined(OS_WIN) #include "chrome/browser/icon_manager.h" diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index 25f84ba..ee7b3b9 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/dom_ui/history_ui.h" +#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/string_piece.h" #include "base/string_util.h" @@ -19,7 +20,6 @@ #include "chrome/common/jstemplate_builder.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "net/base/escape.h" diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index a187560..03091d3 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -6,6 +6,7 @@ #include "chrome/browser/dom_ui/new_tab_ui.h" +#include "app/resource_bundle.h" #include "base/histogram.h" #include "base/string_piece.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -31,7 +32,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 9b6da6b..f97a5bf 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -8,6 +8,7 @@ #include "chrome/browser/download/download_util.h" +#include "app/resource_bundle.h" #include "base/base_drag_source.h" #include "base/file_util.h" #include "base/scoped_clipboard_writer.h" @@ -20,7 +21,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/view.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc index 808a506..813c291 100644 --- a/chrome/browser/drag_utils.cc +++ b/chrome/browser/drag_utils.cc @@ -8,6 +8,7 @@ #include <shlobj.h> #include <shobjidl.h> +#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/gfx/gdi_util.h" #include "base/gfx/point.h" @@ -17,7 +18,6 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/text_button.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension.cc b/chrome/browser/extensions/extension.cc index 35b169e..280b32f 100644 --- a/chrome/browser/extensions/extension.cc +++ b/chrome/browser/extensions/extension.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension.h" +#include "app/resource_bundle.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" @@ -11,7 +12,6 @@ #include "net/base/net_util.h" #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/common/extensions/user_script.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" const char Extension::kManifestFilename[] = "manifest.json"; diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 8cfec94..4e5f615a 100755 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extension_host.h" +#include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/extensions/extension.h" @@ -19,7 +20,6 @@ #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index c73bdc6..4a03e06 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extensions_ui.h" +#include "app/resource_bundle.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extensions_service.h" @@ -12,7 +13,6 @@ #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #include "net/base/net_util.h" diff --git a/chrome/browser/first_run.cc b/chrome/browser/first_run.cc index 8a93bd3..8bb247a 100644 --- a/chrome/browser/first_run.cc +++ b/chrome/browser/first_run.cc @@ -11,6 +11,7 @@ #include "chrome/browser/first_run.h" +#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" @@ -34,7 +35,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/result_codes.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_constants.h" diff --git a/chrome/browser/gtk/about_chrome_dialog.cc b/chrome/browser/gtk/about_chrome_dialog.cc index 0650259..5be8e40 100644 --- a/chrome/browser/gtk/about_chrome_dialog.cc +++ b/chrome/browser/gtk/about_chrome_dialog.cc @@ -7,10 +7,10 @@ #include <gtk/gtk.h> #include <wchar.h> +#include "app/resource_bundle.h" #include "base/file_version_info.h" #include "base/gfx/gtk_util.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/chrome_constants.h" #include "chrome/browser/profile.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 85a6bb7..a6ca59e 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/bookmark_bar_gtk.h" +#include "app/resource_bundle.h" #include "base/gfx/gtk_util.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -17,7 +18,6 @@ #include "chrome/common/l10n_util.h" #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" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index 5f42f77..62a5e7f 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -6,6 +6,7 @@ #include <gdk/gdkkeysyms.h> +#include "app/resource_bundle.h" #include "base/logging.h" #include "base/base_paths_linux.h" #include "base/path_service.h" @@ -26,7 +27,6 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index ceb2561..f8887a0 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -6,6 +6,7 @@ #include <gdk/gdkkeysyms.h> +#include "app/resource_bundle.h" #include "base/base_paths_linux.h" #include "base/command_line.h" #include "base/gfx/gtk_util.h" @@ -36,7 +37,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/button/text_button.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc index d3e9c35..fd263af 100644 --- a/chrome/browser/gtk/custom_button.cc +++ b/chrome/browser/gtk/custom_button.cc @@ -4,8 +4,8 @@ #include "chrome/browser/gtk/custom_button.h" +#include "app/resource_bundle.h" #include "base/basictypes.h" -#include "chrome/common/resource_bundle.h" #include "chrome/browser/gtk/nine_box.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/download_shelf_gtk.cc b/chrome/browser/gtk/download_shelf_gtk.cc index 01636d8..b476508 100644 --- a/chrome/browser/gtk/download_shelf_gtk.cc +++ b/chrome/browser/gtk/download_shelf_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/download_shelf_gtk.h" +#include "app/resource_bundle.h" #include "base/gfx/gtk_util.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/gtk/custom_button.h" @@ -12,7 +13,6 @@ #include "chrome/browser/gtk/slide_animator_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/nine_box.cc b/chrome/browser/gtk/nine_box.cc index d957bfb..901ca68 100644 --- a/chrome/browser/gtk/nine_box.cc +++ b/chrome/browser/gtk/nine_box.cc @@ -4,10 +4,10 @@ #include "chrome/browser/gtk/nine_box.h" +#include "app/resource_bundle.h" #include "base/gfx/gtk_util.h" #include "base/gfx/point.h" #include "base/logging.h" -#include "chrome/common/resource_bundle.h" namespace { diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc index 4a644b3..9966d0f 100644 --- a/chrome/browser/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_gtk.cc @@ -4,10 +4,10 @@ #include "chrome/browser/gtk/tabs/tab_gtk.h" +#include "app/resource_bundle.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/common/gfx/path.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index 1f48684..1ce7aaf 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc @@ -4,11 +4,11 @@ #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h" +#include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_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 "skia/ext/image_operations.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index c9b12e3..33627b6 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" +#include "app/resource_bundle.h" #include "base/gfx/gtk_util.h" #include "base/gfx/point.h" #include "chrome/browser/browser.h" @@ -11,7 +12,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/slide_animation.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc index 92cfc16..11ebfae 100644 --- a/chrome/browser/gtk/toolbar_star_toggle_gtk.cc +++ b/chrome/browser/gtk/toolbar_star_toggle_gtk.cc @@ -4,9 +4,9 @@ #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h" +#include "app/resource_bundle.h" #include "base/gfx/rect.h" #include "chrome/browser/gtk/bookmark_bubble_gtk.h" -#include "chrome/common/resource_bundle.h" #include "grit/theme_resources.h" ToolbarStarToggleGtk::ToolbarStarToggleGtk() diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index 1e7339d..265e2de 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/password_manager/password_manager.h" +#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -12,7 +13,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc index e8ba426..aa803b4 100644 --- a/chrome/browser/plugin_installer.cc +++ b/chrome/browser/plugin_installer.cc @@ -4,10 +4,10 @@ #include "chrome/browser/plugin_installer.h" +#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/tab_contents/tab_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" diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index 8a602f0..6fd6a46 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -7,6 +7,7 @@ #include <string> #include <vector> +#include "app/resource_bundle.h" #include "base/gfx/native_widget_types.h" #include "base/string_util.h" #include "base/time.h" @@ -30,7 +31,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "chrome/common/render_messages.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/result_codes.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/url_constants.h" 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 9eb27d1..b143f2e 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -4,6 +4,7 @@ #include "chrome/browser/renderer_host/render_widget_host_view_win.h" +#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/gfx/gdi_util.h" #include "base/gfx/rect.h" @@ -25,7 +26,6 @@ #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/focus/focus_util_win.h" // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h! diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index e1a21e3..63f9542 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -6,6 +6,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" +#include "app/resource_bundle.h" #include "base/histogram.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" @@ -19,7 +20,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/jstemplate_builder.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 5d60cb8..f37317c 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ssl/ssl_blocking_page.h" +#include "app/resource_bundle.h" #include "base/histogram.h" #include "base/string_piece.h" #include "base/values.h" @@ -19,7 +20,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index 7b54186..f5b0602 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ssl/ssl_manager.h" +#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" @@ -23,7 +24,6 @@ #include "chrome/common/notification_service.h" #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" diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index e921d42..855c3f0 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ssl/ssl_policy.h" +#include "app/resource_bundle.h" #include "base/singleton.h" #include "base/string_piece.h" #include "base/string_util.h" @@ -17,7 +18,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc index 30dabe3..4b3e748 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -4,6 +4,7 @@ #include "chrome/browser/tab_contents/navigation_controller.h" +#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/logging.h" #include "base/string_util.h" @@ -18,7 +19,6 @@ #include "chrome/common/navigation_types.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc index 7633ac6..874f9fc 100644 --- a/chrome/browser/tab_contents/navigation_entry.cc +++ b/chrome/browser/tab_contents/navigation_entry.cc @@ -4,12 +4,12 @@ #include "chrome/browser/tab_contents/navigation_entry.h" +#include "app/resource_bundle.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" -#include "chrome/common/resource_bundle.h" // Use this to get a new unique ID for a NavigationEntry during construction. // The returned ID is guaranteed to be nonzero (which is the "no ID" indicator). diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 72ee5602..2dec5dc 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -4,6 +4,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" +#include "app/resource_bundle.h" #include "base/file_version_info.h" #include "base/process_util.h" #include "base/string16.h" @@ -41,7 +42,6 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/render_messages.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" //#include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index 3c42090..4f96d2b 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/task_manager.h" +#include "app/resource_bundle.h" #include "base/process_util.h" #include "base/stats_table.h" #include "base/string_util.h" @@ -17,7 +18,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/accelerator.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index 7635896..39d4ccb 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -4,6 +4,7 @@ #include "chrome/browser/task_manager_resource_providers.h" +#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/file_version_info.h" #include "base/message_loop.h" @@ -19,7 +20,6 @@ #include "chrome/common/child_process_host.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" #if defined(OS_WIN) #include "chrome/common/gfx/icon_util.h" diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 131d9e0..ed79f59 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -6,6 +6,7 @@ #include <commdlg.h> +#include "app/resource_bundle.h" #include "base/file_version_info.h" #include "base/string_util.h" #include "base/win_util.h" @@ -17,7 +18,6 @@ #include "chrome/browser/views/restart_message_box.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/install_util.h" #include "chrome/views/controls/text_field.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 04bf2cd..2012a44 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -6,6 +6,7 @@ #include <dwmapi.h> +#include "app/resource_bundle.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" @@ -14,7 +15,6 @@ #include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/path.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index a5bcfbb0..37b42f3 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -12,6 +12,7 @@ #include <math.h> +#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/profile.h" @@ -21,7 +22,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/button/menu_button.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 88f0fb5..cc56194 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -6,6 +6,7 @@ #include <limits> +#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/base_drag_source.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" @@ -31,7 +32,6 @@ #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/menu_button.h" #include "chrome/views/controls/menu/chrome_menu.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 9c38f12..86fe3ac 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/bookmark_bubble_view.h" +#include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -15,7 +16,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/text_field.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/bookmark_menu_button.cc b/chrome/browser/views/bookmark_menu_button.cc index 7ee1d0c..4ac62e9 100644 --- a/chrome/browser/views/bookmark_menu_button.cc +++ b/chrome/browser/views/bookmark_menu_button.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/bookmark_menu_button.h" +#include "app/resource_bundle.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/view_ids.h" #include "chrome/common/os_exchange_data.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/widget/widget.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/bookmark_table_view.cc b/chrome/browser/views/bookmark_table_view.cc index b080a92..cf115a4 100644 --- a/chrome/browser/views/bookmark_table_view.cc +++ b/chrome/browser/views/bookmark_table_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/bookmark_table_view.h" +#include "app/resource_bundle.h" #include "base/base_drag_source.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -15,7 +16,6 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/view_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index e049630..5d5ae8f 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/constrained_window_impl.h" +#include "app/resource_bundle.h" #include "base/gfx/rect.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser_process.h" @@ -23,7 +24,6 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/hwnd_view.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 9069c8d..3337c25 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -6,6 +6,7 @@ #include <vector> +#include "app/resource_bundle.h" #include "base/file_path.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" @@ -15,7 +16,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/menu/menu.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index b5045c9..490eb42 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/resource_bundle.h" #include "base/logging.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" @@ -14,7 +15,6 @@ #include "chrome/browser/views/download_item_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc index d108d36..b6ec708 100644 --- a/chrome/browser/views/download_started_animation.cc +++ b/chrome/browser/views/download_started_animation.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/download_started_animation.h" +#include "app/resource_bundle.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/widget_win.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 8173849..98295c9 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/edit_keyword_controller.h" +#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -13,7 +14,6 @@ #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/image_view.h" #include "chrome/views/controls/table/table_view.h" diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index cecf4e8..4aaccee 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/find_bar_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -13,7 +14,6 @@ #include "chrome/browser/view_ids.h" #include "chrome/common/l10n_util.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 31c4432..b1a153a 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/first_run_bubble.h" +#include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" @@ -13,7 +14,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/event.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index 9b12d57..6b5aa77 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/first_run_customize_view.h" +#include "app/resource_bundle.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/controls/combo_box.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index 43f3384..bbfb4f9 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/first_run_view.h" +#include "app/resource_bundle.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/first_run_customize_view.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/controls/image_view.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index 08f30d3..d55832d 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/first_run_view_base.h" +#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/thread.h" @@ -17,7 +18,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/frame/browser_frame.cc b/chrome/browser/views/frame/browser_frame.cc index 235fedc..f8e0ed3 100644 --- a/chrome/browser/views/frame/browser_frame.cc +++ b/chrome/browser/views/frame/browser_frame.cc @@ -7,12 +7,12 @@ #include <dwmapi.h> #include <shellapi.h> +#include "app/resource_bundle.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/views/frame/browser_root_view.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/frame/glass_browser_frame_view.h" #include "chrome/browser/views/frame/opaque_browser_frame_view.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/window/window_delegate.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 8581d43..5150aa9 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/frame/browser_view.h" +#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_version_info.h" #include "base/time.h" @@ -51,7 +52,6 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/scrollbar/native_scroll_bar.h" #include "chrome/views/fill_layout.h" diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc index 770245f..89438b3 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/views/frame/glass_browser_frame_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/frame/glass_browser_frame_view.h" +#include "app/resource_bundle.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/window_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 567b615..8e4a7b6 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/frame/opaque_browser_frame_view.h" +#include "app/resource_bundle.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab_strip.h" @@ -11,7 +12,6 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc index 39ac7490..d1327cd 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/views/fullscreen_exit_bubble.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/fullscreen_exit_bubble.h" +#include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" #include "chrome/common/l10n_util_win.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/widget/root_view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index c203893..9d37319 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/hung_renderer_view.h" +#include "app/resource_bundle.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" @@ -13,7 +14,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/logging_chrome.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/result_codes.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 2d3968a..633de1b 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/info_bubble.h" +#include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" @@ -11,7 +12,6 @@ #include "chrome/common/gfx/path.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index 3ea0421..fd61ba6 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/infobars/infobars.h" +#include "app/resource_bundle.h" #include "base/message_loop.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/slide_animation.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index b972144..e707cb9 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -6,6 +6,7 @@ #include <vector> +#include "app/resource_bundle.h" #include "base/gfx/png_decoder.h" #include "base/string_util.h" #include "chrome/browser/history/history.h" @@ -18,7 +19,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" #include "chrome/views/background.h" #include "chrome/views/grid_layout.h" @@ -485,15 +485,15 @@ void KeywordEditorView::Init() { add_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_NEW_BUTTON)); add_button_->SetEnabled(url_model_->loaded()); - + edit_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_EDIT_BUTTON)); edit_button_->SetEnabled(false); - + remove_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_REMOVE_BUTTON)); remove_button_->SetEnabled(false); - + make_default_button_ = new views::NativeButton( this, l10n_util::GetString(IDS_SEARCH_ENGINES_EDITOR_MAKE_DEFAULT_BUTTON)); @@ -563,7 +563,7 @@ void KeywordEditorView::OnDoubleClick() { void KeywordEditorView::ButtonPressed(views::Button* sender) { if (sender == add_button_) { - EditKeywordController* controller = + EditKeywordController* controller = new EditKeywordController(GetWidget()->GetNativeView(), NULL, this, profile_); controller->Show(); diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 727eebc..9ddeea3 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/location_bar_view.h" +#include "app/resource_bundle.h" #include "base/path_service.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" @@ -24,7 +25,6 @@ #include "chrome/browser/views/first_run_bubble.h" #include "chrome/browser/views/page_info_window.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/win_util.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 3063339..52cdd16 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -12,6 +12,7 @@ #include <vsstyle.h> #include <vssym32.h> +#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/gfx/native_theme.h" @@ -31,7 +32,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/pref_member.h" #include "chrome/common/pref_names.h" -#include "chrome/common/resource_bundle.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/checkbox.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 7263505..e0cc572 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -9,6 +9,7 @@ #include "chrome/browser/views/options/content_page_view.h" +#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/gfx/native_theme.h" #include "chrome/browser/browser_process.h" @@ -21,7 +22,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/button/radio_button.h" #include "chrome/views/controls/text_field.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index f5c0a68..6d66800 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -6,6 +6,7 @@ #include "chrome/browser/views/options/cookies_view.h" +#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.h" #include "chrome/browser/profile.h" @@ -13,7 +14,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/border.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc index fd8ef61..36fbaf2 100644 --- a/chrome/browser/views/options/fonts_languages_window_view.cc +++ b/chrome/browser/views/options/fonts_languages_window_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/options/fonts_languages_window_view.h" +#include "app/resource_bundle.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/options/fonts_page_view.h" #include "chrome/browser/views/options/languages_page_view.h" @@ -11,7 +12,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index c787704..f7be657 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -1,6 +1,9 @@ // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. + +#include "chrome/browser/views/options/fonts_page_view.h" + #include <windows.h> #include <shlobj.h> #include <vsstyle.h> @@ -8,8 +11,7 @@ #include <vector> -#include "chrome/browser/views/options/fonts_page_view.h" - +#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" @@ -22,7 +24,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/text_field.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 4fd0801..229f93a 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/options/general_page_view.h" +#include "app/resource_bundle.h" #include "base/gfx/png_decoder.h" #include "base/message_loop.h" #include "base/string_util.h" @@ -27,7 +28,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/url_constants.h" #include "chrome/views/controls/button/radio_button.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index e8d968d..42e5b89 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -8,6 +8,7 @@ #include "chrome/browser/views/options/languages_page_view.h" +#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/string_util.h" #include "base/gfx/native_theme.h" @@ -23,7 +24,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/button/radio_button.h" #include "chrome/views/controls/combo_box.h" #include "chrome/views/controls/tabbed_pane.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index c666f2a..2302eec 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -7,12 +7,12 @@ #include "chrome/browser/views/options/options_group_view.h" +#include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/separator.h" diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index d163640..8b40893 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/options_window.h" +#include "app/resource_bundle.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/options/advanced_page_view.h" @@ -13,7 +14,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" #include "chrome/personalization/views/user_data_page_view.h" diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index 5fa345e..f1bd9e4 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -7,6 +7,7 @@ #include <cryptuiapi.h> #pragma comment(lib, "cryptui.lib") +#include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.h" #include "chrome/browser/browser_process.h" @@ -18,7 +19,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/background.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 509f951..0ed2454 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/sad_tab_view.h" +#include "app/resource_bundle.h" #include "base/gfx/size.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index bb05c44..a19d6c7 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/shelf_item_dialog.h" +#include "app/resource_bundle.h" #include "base/gfx/png_decoder.h" #include "base/string_util.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -14,7 +15,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" #include "chrome/views/background.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/star_toggle.cc b/chrome/browser/views/star_toggle.cc index 83239e6..d350972 100644 --- a/chrome/browser/views/star_toggle.cc +++ b/chrome/browser/views/star_toggle.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/star_toggle.h" +#include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/resource_bundle.h" #include "grit/theme_resources.h" StarToggle::StarToggle(Delegate* delegate) diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index c657356..2426bf1 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -6,13 +6,13 @@ #include <algorithm> +#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/common/animation.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/l10n_util.h" #include "chrome/common/l10n_util_win.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/label.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget_win.h" @@ -508,7 +508,7 @@ void StatusBubbleViews::SetURL(const GURL& url, const std::wstring& languages) { // Set Elided Text corresponding to the GURL object. RECT parent_rect; ::GetWindowRect(popup_->GetNativeView(), &parent_rect); - int text_width = static_cast<int>(parent_rect.right - parent_rect.left - + int text_width = static_cast<int>(parent_rect.right - parent_rect.left - (kShadowThickness * 2) - kTextPositionX - kTextHorizPadding - 1); url_text_ = gfx::ElideUrl(url, view_->Label::GetFont(), text_width, languages); diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index e9da07e..43afd4f 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -7,6 +7,7 @@ #include <windows.h> #include <shellapi.h> +#include "app/resource_bundle.h" #include "base/file_util.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" @@ -14,7 +15,6 @@ #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 "grit/theme_resources.h" static bool g_initialized = false; diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index 83bf266..8df9a38 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -7,6 +7,7 @@ #include <math.h> #include <set> +#include "app/resource_bundle.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -20,7 +21,6 @@ #include "chrome/common/animation.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/event.h" #include "chrome/views/widget/root_view.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index 37f8db1..e79b77c 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/tabs/tab.h" +#include "app/resource_bundle.h" #include "base/gfx/size.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/views/controls/menu/chrome_menu.h" #include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 7f62be5..e9608bd 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,6 +6,7 @@ #include "chrome/browser/views/tabs/tab_renderer.h" +#include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -13,7 +14,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/l10n_util.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/non_client_view.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 5e8cbdc..1218ed8 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" +#include "app/resource_bundle.h" #include "base/gfx/size.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" @@ -19,7 +20,6 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/slide_animation.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/views/toolbar_star_toggle.cc b/chrome/browser/views/toolbar_star_toggle.cc index b76f442..330bb6c 100644 --- a/chrome/browser/views/toolbar_star_toggle.cc +++ b/chrome/browser/views/toolbar_star_toggle.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/toolbar_star_toggle.h" +#include "app/resource_bundle.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" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 81ea797..ef6d5e2 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -6,6 +6,7 @@ #include <string> +#include "app/resource_bundle.h" #include "base/command_line.h" #include "base/logging.h" #include "base/path_service.h" @@ -37,7 +38,6 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" |