diff options
69 files changed, 20 insertions, 67 deletions
diff --git a/app/l10n_util_mac.h b/app/l10n_util_mac.h index 9f93a42..309a7f0 100644 --- a/app/l10n_util_mac.h +++ b/app/l10n_util_mac.h @@ -6,7 +6,9 @@ #define APP_L10N_UTIL_MAC_H_ #pragma once -#include "app/l10n_util.h" +#include <string> +#include <vector> + #include "base/basictypes.h" #include "base/string16.h" diff --git a/app/l10n_util_mac.mm b/app/l10n_util_mac.mm index 97db5b1..c0be5d8 100644 --- a/app/l10n_util_mac.mm +++ b/app/l10n_util_mac.mm @@ -3,9 +3,12 @@ // found in the LICENSE file. #import <Foundation/Foundation.h> + +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/sys_string_conversions.h" #include "base/lazy_instance.h" +#include "base/logging.h" namespace { diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 7a219d7..96aca15 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -4,6 +4,7 @@ #import "chrome/browser/app_controller_mac.h" +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/auto_reset.h" #include "base/command_line.h" diff --git a/chrome/browser/chromeos/dom_ui/labs_handler.cc b/chrome/browser/chromeos/dom_ui/labs_handler.cc index d6ecee0..007d673 100644 --- a/chrome/browser/chromeos/dom_ui/labs_handler.cc +++ b/chrome/browser/chromeos/dom_ui/labs_handler.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/dom_ui/labs_handler.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/i18n/time_formatting.h" diff --git a/chrome/browser/chromeos/dom_ui/language_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_options_handler.cc index cf3f971..a28eae1 100644 --- a/chrome/browser/chromeos/dom_ui/language_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_options_handler.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/dom_ui/language_options_handler.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/values.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/dom_ui/system_options_handler.cc b/chrome/browser/chromeos/dom_ui/system_options_handler.cc index b280526..fdabd76 100644 --- a/chrome/browser/chromeos/dom_ui/system_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/system_options_handler.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/dom_ui/system_options_handler.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/i18n/time_formatting.h" diff --git a/chrome/browser/chromeos/frame/normal_browser_frame_view.cc b/chrome/browser/chromeos/frame/normal_browser_frame_view.cc index 84c4614..f122a15 100644 --- a/chrome/browser/chromeos/frame/normal_browser_frame_view.cc +++ b/chrome/browser/chromeos/frame/normal_browser_frame_view.cc @@ -7,7 +7,6 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/theme_provider.h" -#include "app/x11_util.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "chrome/browser/browser_theme_provider.h" diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc index ad3dd25..8301d56 100644 --- a/chrome/browser/chromeos/login/eula_view.cc +++ b/chrome/browser/chromeos/login/eula_view.cc @@ -9,7 +9,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/customization_document.h" diff --git a/chrome/browser/chromeos/login/language_switch_menu.cc b/chrome/browser/chromeos/login/language_switch_menu.cc index d93e8fe..d32a0a3 100644 --- a/chrome/browser/chromeos/login/language_switch_menu.cc +++ b/chrome/browser/chromeos/login/language_switch_menu.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/language_switch_menu.h" -#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/chromeos/login/password_changed_view.h b/chrome/browser/chromeos/login/password_changed_view.h index 26df899..48f6ca3 100644 --- a/chrome/browser/chromeos/login/password_changed_view.h +++ b/chrome/browser/chromeos/login/password_changed_view.h @@ -8,7 +8,6 @@ #include <string> -#include "app/message_box_flags.h" #include "views/controls/button/button.h" #include "views/controls/textfield/textfield.h" #include "views/view.h" diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.cc b/chrome/browser/chromeos/login/rounded_rect_painter.cc index 3c2c361..64e73af 100644 --- a/chrome/browser/chromeos/login/rounded_rect_painter.cc +++ b/chrome/browser/chromeos/login/rounded_rect_painter.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/rounded_rect_painter.h" -#include "app/resource_bundle.h" #include "base/logging.h" #include "gfx/canvas_skia.h" #include "third_party/skia/include/effects/SkGradientShader.h" diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc index 8172fb9..2a4110d 100644 --- a/chrome/browser/chromeos/login/screen_locker_tester.cc +++ b/chrome/browser/chromeos/login/screen_locker_tester.cc @@ -6,7 +6,6 @@ #include <gdk/gdkkeysyms.h> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/mock_authenticator.h" #include "chrome/browser/chromeos/login/screen_locker.h" diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index 567dfb8..d8268fb 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -11,7 +11,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/logging.h" diff --git a/chrome/browser/chromeos/network_list.cc b/chrome/browser/chromeos/network_list.cc index f92190f..1ee2b48 100644 --- a/chrome/browser/chromeos/network_list.cc +++ b/chrome/browser/chromeos/network_list.cc @@ -5,7 +5,6 @@ #include "chrome/browser/chromeos/network_list.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc index 437f70f..9d10ac5 100644 --- a/chrome/browser/chromeos/options/internet_page_view.cc +++ b/chrome/browser/chromeos/options/internet_page_view.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/combobox_model.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/options/network_config_view.h" #include "chrome/browser/chromeos/options/options_window_view.h" diff --git a/chrome/browser/chromeos/options/language_chewing_config_view.cc b/chrome/browser/chromeos/options/language_chewing_config_view.cc index 376be8f..a1da7ae 100644 --- a/chrome/browser/chromeos/options/language_chewing_config_view.cc +++ b/chrome/browser/chromeos/options/language_chewing_config_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/options/language_chewing_config_view.h" -#include "app/combobox_model.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/options/language_mozc_config_view.cc b/chrome/browser/chromeos/options/language_mozc_config_view.cc index a48f5ecc..35b8a85 100644 --- a/chrome/browser/chromeos/options/language_mozc_config_view.cc +++ b/chrome/browser/chromeos/options/language_mozc_config_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/options/language_mozc_config_view.h" -#include "app/combobox_model.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/chromeos/options/language_pinyin_config_view.cc b/chrome/browser/chromeos/options/language_pinyin_config_view.cc index 48d79d7..32d526a 100644 --- a/chrome/browser/chromeos/options/language_pinyin_config_view.cc +++ b/chrome/browser/chromeos/options/language_pinyin_config_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/options/language_pinyin_config_view.h" -#include "app/combobox_model.h" #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc index 4535e8b..cce17bb 100644 --- a/chrome/browser/chromeos/options/options_window_view.cc +++ b/chrome/browser/chromeos/options/options_window_view.cc @@ -5,7 +5,6 @@ #include "chrome/browser/options_window.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/scoped_ptr.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/chromeos/options/settings_page_view.h b/chrome/browser/chromeos/options/settings_page_view.h index a87170d..35e9934 100644 --- a/chrome/browser/chromeos/options/settings_page_view.h +++ b/chrome/browser/chromeos/options/settings_page_view.h @@ -10,8 +10,6 @@ #include "chrome/browser/views/options/options_page_view.h" -#include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "views/grid_layout.h" #include "views/standard_layout.h" diff --git a/chrome/browser/chromeos/status/feedback_menu_button.h b/chrome/browser/chromeos/status/feedback_menu_button.h index 43a5c50..9e1590b 100644 --- a/chrome/browser/chromeos/status/feedback_menu_button.h +++ b/chrome/browser/chromeos/status/feedback_menu_button.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_CHROMEOS_STATUS_FEEDBACK_MENU_BUTTON_H_ #pragma once -#include "app/menus/simple_menu_model.h" #include "chrome/browser/chromeos/status/status_area_button.h" #include "views/controls/menu/menu_2.h" #include "views/controls/menu/view_menu_delegate.h" diff --git a/chrome/browser/chromeos/status/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc index 43bdd09..0e91bad 100644 --- a/chrome/browser/chromeos/status/status_area_button.cc +++ b/chrome/browser/chromeos/status/status_area_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/status/status_area_button.h" -#include "app/resource_bundle.h" #include "gfx/canvas.h" #include "gfx/skbitmap_operations.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/chromeos/volume_bubble.h b/chrome/browser/chromeos/volume_bubble.h index 419605b..c2da38e 100644 --- a/chrome/browser/chromeos/volume_bubble.h +++ b/chrome/browser/chromeos/volume_bubble.h @@ -6,7 +6,6 @@ #define CHROME_BROWSER_CHROMEOS_VOLUME_BUBBLE_H_ #pragma once -#include "app/active_window_watcher_x.h" #include "app/slide_animation.h" #include "base/singleton.h" #include "chrome/browser/views/info_bubble.h" diff --git a/chrome/browser/chromeos/volume_bubble_view.cc b/chrome/browser/chromeos/volume_bubble_view.cc index 5aa99c1..44f78bc 100644 --- a/chrome/browser/chromeos/volume_bubble_view.cc +++ b/chrome/browser/chromeos/volume_bubble_view.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "gfx/canvas.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/cocoa/about_window_controller.mm b/chrome/browser/cocoa/about_window_controller.mm index 1dcb37a..f366b61 100644 --- a/chrome/browser/cocoa/about_window_controller.mm +++ b/chrome/browser/cocoa/about_window_controller.mm @@ -4,6 +4,7 @@ #import "chrome/browser/cocoa/about_window_controller.h" +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "app/resource_bundle.h" #include "base/logging.h" diff --git a/chrome/browser/cocoa/browser_window_controller.mm b/chrome/browser/cocoa/browser_window_controller.mm index d31659b0..b6eb3b1 100644 --- a/chrome/browser/cocoa/browser_window_controller.mm +++ b/chrome/browser/cocoa/browser_window_controller.mm @@ -6,6 +6,7 @@ #include <Carbon/Carbon.h> +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/mac_util.h" #include "base/nsimage_cache_mac.h" diff --git a/chrome/browser/cocoa/collected_cookies_mac.h b/chrome/browser/cocoa/collected_cookies_mac.h index 9f5b5dd..7bd7a90 100644 --- a/chrome/browser/cocoa/collected_cookies_mac.h +++ b/chrome/browser/cocoa/collected_cookies_mac.h @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/tree_model.h" #include "base/cocoa_protocols_mac.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" diff --git a/chrome/browser/cocoa/content_exceptions_window_controller.mm b/chrome/browser/cocoa/content_exceptions_window_controller.mm index 582997c..6d0c177a 100644 --- a/chrome/browser/cocoa/content_exceptions_window_controller.mm +++ b/chrome/browser/cocoa/content_exceptions_window_controller.mm @@ -4,6 +4,7 @@ #import "chrome/browser/cocoa/content_exceptions_window_controller.h" +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "app/table_model_observer.h" #include "base/command_line.h" diff --git a/chrome/browser/cocoa/cookies_window_controller.h b/chrome/browser/cocoa/cookies_window_controller.h index 2ebe4d0..ea3e0fd 100644 --- a/chrome/browser/cocoa/cookies_window_controller.h +++ b/chrome/browser/cocoa/cookies_window_controller.h @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/tree_model.h" #include "base/cocoa_protocols_mac.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" @@ -15,6 +14,8 @@ @class CookiesWindowController; @class CookieDetailsViewController; class Profile; +class TreeModel; +class TreeModelNode; namespace { class CookiesWindowControllerTest; diff --git a/chrome/browser/cocoa/download_item_controller.mm b/chrome/browser/cocoa/download_item_controller.mm index 1c77eee..86cab8d 100644 --- a/chrome/browser/cocoa/download_item_controller.mm +++ b/chrome/browser/cocoa/download_item_controller.mm @@ -9,6 +9,7 @@ #include "app/text_elider.h" #include "base/histogram.h" #include "base/mac_util.h" +#include "base/string_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #import "chrome/browser/browser_theme_provider.h" diff --git a/chrome/browser/cocoa/import_progress_dialog.mm b/chrome/browser/cocoa/import_progress_dialog.mm index 83da1d3..109365b 100644 --- a/chrome/browser/cocoa/import_progress_dialog.mm +++ b/chrome/browser/cocoa/import_progress_dialog.mm @@ -4,6 +4,7 @@ #import "chrome/browser/cocoa/import_progress_dialog.h" +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/mac_util.h" diff --git a/chrome/browser/cocoa/install_from_dmg.mm b/chrome/browser/cocoa/install_from_dmg.mm index 27ffa38..cffe3fc 100644 --- a/chrome/browser/cocoa/install_from_dmg.mm +++ b/chrome/browser/cocoa/install_from_dmg.mm @@ -13,6 +13,7 @@ #include <sys/param.h> #include <sys/mount.h> +#include "app/l10n_util.h" #import "app/l10n_util_mac.h" #include "base/basictypes.h" #include "base/command_line.h" diff --git a/chrome/browser/cocoa/keystone_glue.mm b/chrome/browser/cocoa/keystone_glue.mm index a097fd7..a0162a3 100644 --- a/chrome/browser/cocoa/keystone_glue.mm +++ b/chrome/browser/cocoa/keystone_glue.mm @@ -9,6 +9,7 @@ #include <vector> +#include "app/l10n_util.h" #import "app/l10n_util_mac.h" #include "base/logging.h" #include "base/mac_util.h" diff --git a/chrome/browser/cocoa/restart_browser.mm b/chrome/browser/cocoa/restart_browser.mm index d3747d60..3d0cbb1 100644 --- a/chrome/browser/cocoa/restart_browser.mm +++ b/chrome/browser/cocoa/restart_browser.mm @@ -4,6 +4,7 @@ #import "chrome/browser/cocoa/restart_browser.h" +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm index 7f0e3ed..7a54619 100644 --- a/chrome/browser/cocoa/toolbar_controller.mm +++ b/chrome/browser/cocoa/toolbar_controller.mm @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "app/menus/accelerator_cocoa.h" #include "app/menus/menu_model.h" diff --git a/chrome/browser/cocoa/ui_localizer.mm b/chrome/browser/cocoa/ui_localizer.mm index 77e9154..d085353 100644 --- a/chrome/browser/cocoa/ui_localizer.mm +++ b/chrome/browser/cocoa/ui_localizer.mm @@ -7,6 +7,7 @@ #import <Foundation/Foundation.h> #include <stdlib.h> +#include "app/l10n_util.h" #include "app/l10n_util_mac.h" #include "base/sys_string_conversions.h" #include "base/logging.h" diff --git a/chrome/browser/cocoa/web_contents_drag_source.h b/chrome/browser/cocoa/web_contents_drag_source.h index a0d31b2..55e93b9 100644 --- a/chrome/browser/cocoa/web_contents_drag_source.h +++ b/chrome/browser/cocoa/web_contents_drag_source.h @@ -8,7 +8,6 @@ #import <Cocoa/Cocoa.h> -#include "app/download_file_interface.h" #include "base/file_path.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" @@ -63,4 +62,3 @@ @end #endif // define CHROME_BROWSER_COCOA_WEB_CONTENTS_DRAG_SOURCE_H_ - diff --git a/chrome/browser/cocoa/web_drag_source.h b/chrome/browser/cocoa/web_drag_source.h index a853c6b..9cfcba5 100644 --- a/chrome/browser/cocoa/web_drag_source.h +++ b/chrome/browser/cocoa/web_drag_source.h @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/download_file_interface.h" #include "base/file_path.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" diff --git a/chrome/browser/gtk/back_forward_button_gtk.cc b/chrome/browser/gtk/back_forward_button_gtk.cc index 6b0b213..d5a7f55 100644 --- a/chrome/browser/gtk/back_forward_button_gtk.cc +++ b/chrome/browser/gtk/back_forward_button_gtk.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/menus/menu_model.h" #include "base/message_loop.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/back_forward_menu_model.h" @@ -133,4 +132,3 @@ gboolean BackForwardButtonGtk::OnMouseMove(GtkWidget* widget, ShowBackForwardMenu(); return FALSE; } - diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index 7f9f978..bcba1cb 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -7,9 +7,7 @@ #include <vector> #include "app/gtk_dnd_util.h" -#include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "app/text_elider.h" #include "base/pickle.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_model.h" diff --git a/chrome/browser/gtk/bookmark_bubble_gtk.cc b/chrome/browser/gtk/bookmark_bubble_gtk.cc index d573c84..04c6ac0 100644 --- a/chrome/browser/gtk/bookmark_bubble_gtk.cc +++ b/chrome/browser/gtk/bookmark_bubble_gtk.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "base/logging.h" diff --git a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc index e9395f2..0a1753f 100644 --- a/chrome/browser/gtk/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/gtk/bookmark_menu_controller_gtk.cc @@ -8,7 +8,6 @@ #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/gtk/bookmark_tree_model.cc b/chrome/browser/gtk/bookmark_tree_model.cc index 2a9c449..715fad8 100644 --- a/chrome/browser/gtk/bookmark_tree_model.cc +++ b/chrome/browser/gtk/bookmark_tree_model.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/gtk/bookmark_utils_gtk.h" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index 921048c..6e77605 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -11,7 +11,6 @@ #include "app/gtk_dnd_util.h" #include "app/l10n_util.h" #include "app/menus/accelerator_gtk.h" -#include "app/resource_bundle.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/i18n/rtl.h" diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index f015ac9..a7288e6 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -10,8 +10,6 @@ #include "app/gtk_util.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" -#include "app/theme_provider.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/keyboard_codes.h" diff --git a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc index 56384ba..90e1d5a 100644 --- a/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc +++ b/chrome/browser/gtk/clear_browsing_data_dialog_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" diff --git a/chrome/browser/gtk/collected_cookies_gtk.cc b/chrome/browser/gtk/collected_cookies_gtk.cc index 1d83116..2992120 100644 --- a/chrome/browser/gtk/collected_cookies_gtk.cc +++ b/chrome/browser/gtk/collected_cookies_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/collected_cookies_gtk.h" -#include "app/gtk_util.h" #include "app/l10n_util.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/gtk/gtk_util.h" diff --git a/chrome/browser/gtk/custom_button.cc b/chrome/browser/gtk/custom_button.cc index b891fa1..603b6a7 100644 --- a/chrome/browser/gtk/custom_button.cc +++ b/chrome/browser/gtk/custom_button.cc @@ -4,9 +4,7 @@ #include "chrome/browser/gtk/custom_button.h" -#include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "app/theme_provider.h" #include "base/basictypes.h" #include "chrome/browser/gtk/cairo_cached_surface.h" #include "chrome/browser/gtk/gtk_chrome_button.h" diff --git a/chrome/browser/gtk/download_item_gtk.cc b/chrome/browser/gtk/download_item_gtk.cc index 7a68dc1..3a0c801 100644 --- a/chrome/browser/gtk/download_item_gtk.cc +++ b/chrome/browser/gtk/download_item_gtk.cc @@ -4,9 +4,7 @@ #include "chrome/browser/gtk/download_item_gtk.h" -#include "app/gtk_util.h" #include "app/l10n_util.h" -#include "app/menus/simple_menu_model.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" #include "app/text_elider.h" diff --git a/chrome/browser/gtk/first_run_dialog.cc b/chrome/browser/gtk/first_run_dialog.cc index 7c5eae7..2af21c1 100644 --- a/chrome/browser/gtk/first_run_dialog.cc +++ b/chrome/browser/gtk/first_run_dialog.cc @@ -5,7 +5,6 @@ #include "chrome/browser/gtk/first_run_dialog.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_chrome_link_button.h" diff --git a/chrome/browser/gtk/import_dialog_gtk.cc b/chrome/browser/gtk/import_dialog_gtk.cc index 5af8aec..786007c 100644 --- a/chrome/browser/gtk/import_dialog_gtk.cc +++ b/chrome/browser/gtk/import_dialog_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" #include "chrome/browser/gtk/gtk_util.h" diff --git a/chrome/browser/gtk/import_lock_dialog_gtk.cc b/chrome/browser/gtk/import_lock_dialog_gtk.cc index dac4123..02c4b8d 100644 --- a/chrome/browser/gtk/import_lock_dialog_gtk.cc +++ b/chrome/browser/gtk/import_lock_dialog_gtk.cc @@ -5,7 +5,6 @@ #include "chrome/browser/gtk/import_lock_dialog_gtk.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/message_loop.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/importer/importer.h" diff --git a/chrome/browser/gtk/import_progress_dialog_gtk.cc b/chrome/browser/gtk/import_progress_dialog_gtk.cc index 09e30da..7e0e297 100644 --- a/chrome/browser/gtk/import_progress_dialog_gtk.cc +++ b/chrome/browser/gtk/import_progress_dialog_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_util.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/info_bubble_gtk.cc b/chrome/browser/gtk/info_bubble_gtk.cc index 1da8383..2e91b8b 100644 --- a/chrome/browser/gtk/info_bubble_gtk.cc +++ b/chrome/browser/gtk/info_bubble_gtk.cc @@ -7,7 +7,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/logging.h" #include "chrome/browser/gtk/gtk_theme_provider.h" diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index f170a1b..08cf95f 100644 --- a/chrome/browser/gtk/menu_gtk.cc +++ b/chrome/browser/gtk/menu_gtk.cc @@ -6,11 +6,9 @@ #include <map> -#include "app/l10n_util.h" #include "app/menus/accelerator_gtk.h" #include "app/menus/button_menu_item_model.h" #include "app/menus/menu_model.h" -#include "app/resource_bundle.h" #include "base/gtk_util.h" #include "base/i18n/rtl.h" #include "base/logging.h" diff --git a/chrome/browser/gtk/nine_box.cc b/chrome/browser/gtk/nine_box.cc index 973d3c5..9d65387 100644 --- a/chrome/browser/gtk/nine_box.cc +++ b/chrome/browser/gtk/nine_box.cc @@ -5,7 +5,6 @@ #include "chrome/browser/gtk/nine_box.h" #include "app/resource_bundle.h" -#include "app/theme_provider.h" #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "base/logging.h" diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/gtk/notifications/balloon_view_gtk.cc index 1ab1670..cc814e3 100644 --- a/chrome/browser/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/gtk/notifications/balloon_view_gtk.cc @@ -10,7 +10,6 @@ #include <vector> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "app/slide_animation.h" #include "base/message_loop.h" #include "base/string_util.h" diff --git a/chrome/browser/gtk/options/content_page_gtk.cc b/chrome/browser/gtk/options/content_page_gtk.cc index a660795..d322919 100644 --- a/chrome/browser/gtk/options/content_page_gtk.cc +++ b/chrome/browser/gtk/options/content_page_gtk.cc @@ -8,7 +8,6 @@ #include "app/gtk_util.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/command_line.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" diff --git a/chrome/browser/gtk/options/fonts_page_gtk.cc b/chrome/browser/gtk/options/fonts_page_gtk.cc index f5b1902..33b0bb8 100644 --- a/chrome/browser/gtk/options/fonts_page_gtk.cc +++ b/chrome/browser/gtk/options/fonts_page_gtk.cc @@ -5,7 +5,7 @@ #include "chrome/browser/gtk/options/fonts_page_gtk.h" #include "app/l10n_util.h" -#include "app/l10n_util_collator.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/default_encoding_combo_model.h" #include "chrome/browser/gtk/gtk_util.h" diff --git a/chrome/browser/gtk/options/managed_prefs_banner_gtk.cc b/chrome/browser/gtk/options/managed_prefs_banner_gtk.cc index a175fad..ad03860 100644 --- a/chrome/browser/gtk/options/managed_prefs_banner_gtk.cc +++ b/chrome/browser/gtk/options/managed_prefs_banner_gtk.cc @@ -5,7 +5,6 @@ #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "chrome/browser/gtk/gtk_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc index 82f6a25..7e5c551 100644 --- a/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc +++ b/chrome/browser/gtk/options/passwords_exceptions_page_gtk.cc @@ -7,7 +7,6 @@ #include <string> #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_tree.h" diff --git a/chrome/browser/gtk/options/passwords_page_gtk.cc b/chrome/browser/gtk/options/passwords_page_gtk.cc index 26fd572..1d2d79f 100644 --- a/chrome/browser/gtk/options/passwords_page_gtk.cc +++ b/chrome/browser/gtk/options/passwords_page_gtk.cc @@ -8,7 +8,6 @@ #include "app/gtk_util.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/gtk/gtk_tree.h" diff --git a/chrome/browser/gtk/repost_form_warning_gtk.cc b/chrome/browser/gtk/repost_form_warning_gtk.cc index 815c1ea..a53aef4 100644 --- a/chrome/browser/gtk/repost_form_warning_gtk.cc +++ b/chrome/browser/gtk/repost_form_warning_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/gtk/repost_form_warning_gtk.h" -#include "app/gtk_util.h" #include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/browser/gtk/gtk_util.h" @@ -89,4 +88,3 @@ void RepostFormWarningGtk::OnHierarchyChanged(GtkWidget* root, } gtk_widget_grab_focus(cancel_); } - diff --git a/chrome/browser/gtk/rounded_window.cc b/chrome/browser/gtk/rounded_window.cc index 053f9ad..e2fde09 100644 --- a/chrome/browser/gtk/rounded_window.cc +++ b/chrome/browser/gtk/rounded_window.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include <math.h> -#include "app/gtk_signal.h" #include "app/gtk_signal_registrar.h" #include "base/i18n/rtl.h" #include "chrome/browser/gtk/gtk_util.h" diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc index b62191d..17e0858 100644 --- a/chrome/browser/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_gtk.cc @@ -7,9 +7,7 @@ #include <gdk/gdkkeysyms.h> #include "app/gtk_dnd_util.h" -#include "app/l10n_util.h" #include "app/menus/accelerator_gtk.h" -#include "app/resource_bundle.h" #include "base/keyboard_codes_posix.h" #include "base/singleton.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/gtk/tabs/tab_gtk.h b/chrome/browser/gtk/tabs/tab_gtk.h index 54a7a5a..64c5513 100644 --- a/chrome/browser/gtk/tabs/tab_gtk.h +++ b/chrome/browser/gtk/tabs/tab_gtk.h @@ -7,7 +7,6 @@ #pragma once #include "app/gtk_signal.h" -#include "app/theme_provider.h" #include "base/basictypes.h" #include "base/message_loop.h" #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h" diff --git a/chrome/browser/gtk/translate/translate_infobar_base_gtk.cc b/chrome/browser/gtk/translate/translate_infobar_base_gtk.cc index bb55831..43fa44c 100644 --- a/chrome/browser/gtk/translate/translate_infobar_base_gtk.cc +++ b/chrome/browser/gtk/translate/translate_infobar_base_gtk.cc @@ -5,7 +5,6 @@ #include "chrome/browser/gtk/translate/translate_infobar_base_gtk.h" #include "app/l10n_util.h" -#include "app/resource_bundle.h" #include "app/slide_animation.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/options_menu_model.h" diff --git a/chrome/browser/gtk/update_recommended_dialog.cc b/chrome/browser/gtk/update_recommended_dialog.cc index e2ab33e..2ece6ba 100644 --- a/chrome/browser/gtk/update_recommended_dialog.cc +++ b/chrome/browser/gtk/update_recommended_dialog.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/message_box_flags.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/gtk/gtk_util.h" diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc index 4c0d8cd4..d3dbee0 100644 --- a/chrome/browser/platform_util_chromeos.cc +++ b/chrome/browser/platform_util_chromeos.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> #include "app/l10n_util.h" -#include "app/gtk_util.h" #include "base/file_util.h" #include "base/process_util.h" #include "base/task.h" |