Cleanup: Remove unneeded headers from app/ (part 2)

BUG=none TEST=none Review URL: http://codereview.chromium.org/3066014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54437 0039d316-1c4b-4281-b951-d872f2087c98
FairyWorld · Jul 31, 2010 · 600216b · 600216b
1 parent 0ccf461
commit 600216b
Show file tree

Hide file tree

Showing 70 changed files with 21 additions and 98 deletions.
diff --git a/chrome/browser/autofill/autofill_cc_infobar_win.cc b/chrome/browser/autofill/autofill_cc_infobar_win.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/autofill/autofill_cc_infobar.h"
 
-#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/infobars/infobar_button_border.h"
@@ -191,4 +190,3 @@ InfoBar* CreateAutofillCcInfoBar(ConfirmInfoBarDelegate* delegate) {
   DCHECK(delegate);
   return new SaveCCInfoConfirmInfoBar(delegate);
 }
-
diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc
@@ -11,7 +11,6 @@
 #include <algorithm>
 
 #include "app/l10n_util.h"
-#include "app/message_box_flags.h"
 #include "app/win_util.h"
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"

diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "app/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/win_util.h"
@@ -994,4 +993,3 @@ void ExternalTabContainer::SetupExternalTabView() {
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->ChangeTabContents(tab_contents_);
 }
-
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
@@ -14,7 +14,6 @@
 // TODO(port): trim this include list once first run has been refactored fully.
 #include "app/app_switches.h"
 #include "app/l10n_util.h"
-#include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/file_util.h"

diff --git a/chrome/browser/input_window_dialog_win.cc b/chrome/browser/input_window_dialog_win.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/input_window_dialog.h"
 
-#include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"

diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
@@ -9,7 +9,6 @@
 #include <shlobj.h>
 #include <shobjidl.h>
 
-#include "app/win_util.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"

diff --git a/chrome/browser/views/app_launcher.cc b/chrome/browser/views/app_launcher.cc
@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-#include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"

diff --git a/chrome/browser/views/appcache_info_view.cc b/chrome/browser/views/appcache_info_view.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/views/appcache_info_view.h"
 
-#include "app/l10n_util.h"
 #include "base/i18n/time_formatting.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 

diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.cc b/chrome/browser/views/autocomplete/autocomplete_popup_win.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
 
-#include "app/win_util.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_contents_view.h"

diff --git a/chrome/browser/views/bookmark_bar_instructions_view.cc b/chrome/browser/views/bookmark_bar_instructions_view.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/bookmark_bar_instructions_view.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/defaults.h"
 #include "grit/generated_resources.h"

diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h
@@ -8,7 +8,6 @@
 
 #include <vector>
 
-#include "app/combobox_model.h"
 #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "gfx/rect.h"

diff --git a/chrome/browser/views/bookmark_context_menu_controller_views.cc b/chrome/browser/views/bookmark_context_menu_controller_views.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/bookmark_context_menu_controller_views.h"
 
-#include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h"

diff --git a/chrome/browser/views/bookmark_menu_controller_views.cc b/chrome/browser/views/bookmark_menu_controller_views.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/bookmark_menu_controller_views.h"
 
-#include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"

diff --git a/chrome/browser/views/browser_bubble.cc b/chrome/browser/views/browser_bubble.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/browser_bubble.h"
 
-#include "app/l10n_util.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #if defined(OS_WIN)
 #include "chrome/browser/external_tab_container_win.h"

diff --git a/chrome/browser/views/browser_bubble_win.cc b/chrome/browser/views/browser_bubble_win.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/browser_bubble.h"
 
-#include "app/l10n_util_win.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_win.h"

diff --git a/chrome/browser/views/constrained_window_win.cc b/chrome/browser/views/constrained_window_win.cc
@@ -4,9 +4,7 @@
 
 #include "chrome/browser/views/constrained_window_win.h"
 
-#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/text_elider.h"
 #include "app/win_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"

diff --git a/chrome/browser/views/database_open_info_view.cc b/chrome/browser/views/database_open_info_view.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/views/database_open_info_view.h"
 
-#include "app/l10n_util.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
 

diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
@@ -9,7 +9,6 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
-#include "app/theme_provider.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/histogram.h"
@@ -30,10 +29,6 @@
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
-#if defined(OS_WIN)
-#include "app/win_util.h"
-#endif
-
 using base::TimeDelta;
 
 // TODO(paulg): These may need to be adjusted when download progress

diff --git a/chrome/browser/views/find_bar_host.cc b/chrome/browser/views/find_bar_host.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/find_bar_host.h"
 
-#include "app/slide_animation.h"
 #include "base/keyboard_codes.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"

diff --git a/chrome/browser/views/find_bar_host.h b/chrome/browser/views/find_bar_host.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_
 #pragma once
 
-#include "app/animation.h"
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/views/dropdown_bar_host.h"

diff --git a/chrome/browser/views/frame/browser_frame_win.cc b/chrome/browser/views/frame/browser_frame_win.cc
@@ -9,8 +9,6 @@
 
 #include <set>
 
-#include "app/resource_bundle.h"
-#include "app/theme_provider.h"
 #include "app/win_util.h"
 #include "base/win_util.h"
 #include "chrome/browser/profile.h"

diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc
@@ -28,10 +28,6 @@
 #include "views/window/window_resources.h"
 #include "views/window/window_shape.h"
 
-#if defined(OS_WIN)
-#include "app/win_util.h"
-#endif
-
 #if defined(OS_LINUX)
 #include "views/window/hit_test.h"
 #endif

diff --git a/chrome/browser/views/infobars/after_translate_infobar.cc b/chrome/browser/views/infobars/after_translate_infobar.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/infobars/after_translate_infobar.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"

diff --git a/chrome/browser/views/infobars/after_translate_infobar.h b/chrome/browser/views/infobars/after_translate_infobar.h
@@ -8,7 +8,6 @@
 
 #include <string>
 
-#include "app/menus/simple_menu_model.h"
 #include "chrome/browser/translate/languages_menu_model.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_view.h"

diff --git a/chrome/browser/views/infobars/before_translate_infobar.cc b/chrome/browser/views/infobars/before_translate_infobar.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/infobars/before_translate_infobar.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"

diff --git a/chrome/browser/views/infobars/before_translate_infobar.h b/chrome/browser/views/infobars/before_translate_infobar.h
@@ -8,7 +8,6 @@
 
 #include <string>
 
-#include "app/menus/simple_menu_model.h"
 #include "chrome/browser/translate/languages_menu_model.h"
 #include "chrome/browser/translate/options_menu_model.h"
 #include "chrome/browser/translate/translate_infobar_view.h"

diff --git a/chrome/browser/views/infobars/infobar_button_border.cc b/chrome/browser/views/infobars/infobar_button_border.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/infobars/infobar_button_border.h"
 
-#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "gfx/canvas.h"
 #include "grit/theme_resources.h"

diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
@@ -9,7 +9,6 @@
 #include <Windows.h>
 #include <map>
 
-#include "app/table_model.h"
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
 #include "chrome/browser/search_engines/keyword_editor_controller.h"
 #include "chrome/browser/search_engines/template_url_model.h"

diff --git a/chrome/browser/views/notifications/balloon_view.h b/chrome/browser/views/notifications/balloon_view.h
@@ -39,7 +39,6 @@ class BalloonCollection;
 class NotificationDetails;
 class NotificationOptionsMenuModel;
 class NotificationSource;
-class SlideAnimation;
 
 // A balloon view is the UI component for a desktop notification toasts.
 // It draws a border, and within the border an HTML renderer.

diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
@@ -12,7 +12,6 @@
 #include <vsstyle.h>
 #include <vssym32.h>
 
-#include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"

diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
@@ -10,7 +10,6 @@
 #include <vssym32.h>
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/string_util.h"
 #include "chrome/browser/autofill/autofill_dialog.h"

diff --git a/chrome/browser/views/options/content_settings_window_view.cc b/chrome/browser/views/options/content_settings_window_view.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/options/content_settings_window_view.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/pref_service.h"

diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h
@@ -8,7 +8,6 @@
 
 #include <string>
 
-#include "app/tree_model.h"
 #include "base/task.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "net/base/cookie_monster.h"
@@ -34,6 +33,8 @@ class DatabaseInfoView;
 class LocalStorageInfoView;
 class Profile;
 class Timer;
+class TreeModel;
+class TreeModelNode;
 
 
 class CookiesView : public CookiesTreeModel::Observer,

diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/options/fonts_languages_window_view.h"
 
 #include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/options/fonts_page_view.h"

diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
@@ -12,10 +12,10 @@
 #include <vector>
 
 #include "app/l10n_util.h"
-#include "app/l10n_util_collator.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/default_encoding_combo_model.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"

diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/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 "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_window.h"

diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc
@@ -12,7 +12,6 @@
 #include <set>
 
 #include "app/l10n_util.h"
-#include "app/win_util.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/registry.h"

diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
@@ -7,7 +7,6 @@
 #include <algorithm>
 
 #include "app/linear_animation.h"
-#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"

diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.cc b/chrome/browser/views/tab_contents/render_view_context_menu_views.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/views/tab_contents/render_view_context_menu_views.h"
 
-#include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/keyboard_codes.h"
 #include "chrome/app/chrome_dll_resource.h"

diff --git a/chrome/browser/views/tab_contents/render_view_context_menu_views.h b/chrome/browser/views/tab_contents/render_view_context_menu_views.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_
 #pragma once
 
-#include "app/menus/simple_menu_model.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"

diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.cc b/chrome/browser/views/tab_contents/tab_contents_view_win.cc
@@ -6,7 +6,6 @@
 
 #include <windows.h>
 
-#include "app/os_exchange_data.h"
 #include "base/file_path.h"
 #include "base/keyboard_codes.h"
 #include "base/time.h"

diff --git a/chrome/browser/views/tabs/base_tab.cc b/chrome/browser/views/tabs/base_tab.cc
@@ -6,7 +6,6 @@
 
 #include <limits>
 
-#include "app/animation_container.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/slide_animation.h"

diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -9,7 +9,6 @@
 
 #include "app/animation.h"
 #include "app/slide_animation.h"
-#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"

diff --git a/chrome/browser/views/tabs/side_tab.cc b/chrome/browser/views/tabs/side_tab.cc
@@ -5,7 +5,6 @@
 #include "chrome/browser/views/tabs/side_tab.h"
 
 #include "app/resource_bundle.h"
-#include "app/theme_provider.h"
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"