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

70 files changed, 21 insertions, 98 deletions

diff --git a/chrome/browser/autofill/autofill_cc_infobar_win.cc b/chrome/browser/autofill/autofill_cc_infobar_win.cc
index b488a4c..1a6f8ad 100644
--- 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
index 1b327ac..4e6eca9 100644
--- 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
index 86ccefe..c32da01 100644
--- 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
index 6e2e1aa..d885ad7 100644
--- 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
index 2d606df..f8c8d32 100644
--- 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
index d7aa86e..4dd94dc 100644
--- 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
index beddd9f..32bc5e9 100644
--- 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
index 55973ec..03d3919 100644
--- 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
index 4cb7ddc..e720108 100644
--- 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
index 895ae0c..c9e9487 100644
--- 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
index 86d5616..a185986 100644
--- 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
index 66dfe38..2884dba 100644
--- 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
index 372fa68..cabef91 100644
--- 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
index c3d2268..a118852 100644
--- 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
index c9add4f..deaa185 100644
--- 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
index 43bcb05..bb2bffa 100644
--- 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
index 1e0fbc2..02e7fae 100644
--- 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
index bc5f0c5..d7d865b 100644
--- 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
index 5ff60ad..3dc26a3 100644
--- 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
index ab03f93..f611596 100644
--- 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
index 7ddd92f..80f8074 100644
--- 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
index 0862478..f52000b 100644
--- 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
index 95c73bd..63b6c8a 100644
--- 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
index 4481cb0..4dff257 100644
--- 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
index 12c2907..f4d636a 100644
--- 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
index a6610ab..082d3b9 100644
--- 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
index 7a0ad9d..ed65885 100644
--- 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
index 9b4229c..a321347 100644
--- 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
index 9ebb26c..ad4380e 100644
--- 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
index dc95e92..948a423 100644
--- 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
index aca4e7a..0b14992 100644
--- 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
index f763e9e..82060f6 100644
--- 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
index 8fddb2b..5ea3fe1 100644
--- 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
index 4837582..cfa39bd 100644
--- 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
index 0b1ab97..4b995cf 100644
--- 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
index 70a043d..5923acc 100644
--- 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
index aa82167..7d74595 100644
--- 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
index 71be04d..8bc3333 100644
--- 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
index 3fb8f28..f2092c5 100644
--- 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
index 65ef289..e832bf0 100644
--- 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
index 4ac40ac..2150b5c 100644
--- 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
index 7545c72..eb2a5b5 100644
--- 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
index f83d863..68863c1 100644
--- 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
index f57a32b..3959c06 100644
--- 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"
diff --git a/chrome/browser/views/tabs/side_tab.h b/chrome/browser/views/tabs/side_tab.h
index b9877ef..6cff764 100644
--- a/chrome/browser/views/tabs/side_tab.h
+++ b/chrome/browser/views/tabs/side_tab.h
@@ -6,7 +6,6 @@
 #define CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_
 #pragma once
 
-#include "app/slide_animation.h"
 #include "chrome/browser/views/tabs/base_tab.h"
 #include "gfx/font.h"
 
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index 318a7e8..eef7f9c 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -8,7 +8,6 @@
 #include "app/drag_drop_types.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/slide_animation.h"
 #include "base/compiler_specific.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/browser.h"
diff --git a/chrome/browser/views/url_picker.cc b/chrome/browser/views/url_picker.cc
index aa749e8..a7f3129 100644
--- a/chrome/browser/views/url_picker.cc
+++ b/chrome/browser/views/url_picker.cc
@@ -7,7 +7,6 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model.h"
-#include "app/table_model_observer.h"
 #include "base/keyboard_codes.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index d1cf8e1..1ea5ae4d 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -5,9 +5,7 @@
 #include "build/build_config.h"
 
 #if defined(OS_WIN)
-#include "app/win_util.h"
-#include "chrome/test/injection_test_dll.h"
-#include "sandbox/src/sandbox.h"
+#include <windows.h>
 #endif
 
 #include "app/hi_res_timer_manager.h"
@@ -22,11 +20,14 @@
 #include "chrome/common/main_function_params.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/common/sandbox_policy.h"
+#include "chrome/nacl/nacl_main_platform_delegate.h"
+#include "chrome/nacl/nacl_thread.h"
+
 #if defined(OS_WIN)
 #include "chrome/nacl/broker_thread.h"
+#include "chrome/test/injection_test_dll.h"
+#include "sandbox/src/sandbox.h"
 #endif
-#include "chrome/nacl/nacl_main_platform_delegate.h"
-#include "chrome/nacl/nacl_thread.h"
 
 #ifdef _WIN64
 
@@ -131,5 +132,3 @@ int NaClMain(const MainFunctionParams& parameters) {
   platform.PlatformUninitialize();
   return 0;
 }
-
-
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index eccdc27..2f16e63 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -4,11 +4,13 @@
 
 #include "build/build_config.h"
 
-#include "app/hi_res_timer_manager.h"
-#include "app/system_monitor.h"
 #if defined(OS_WIN)
-#include "app/win_util.h"
+#include <objbase.h>
+#include <windows.h>
 #endif
+
+#include "app/hi_res_timer_manager.h"
+#include "app/system_monitor.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 3ceb8ee..526ed56 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/renderer/print_web_view_helper.h"
 
-#include "app/l10n_util.h"
 #include "base/logging.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_view.h"
diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc
index f521e11..daf873a 100644
--- a/chrome/renderer/renderer_main.cc
+++ b/chrome/renderer/renderer_main.cc
@@ -8,8 +8,6 @@
 #endif  // OS_MACOSX
 
 #include "app/hi_res_timer_manager.h"
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "app/system_monitor.h"
 #include "base/command_line.h"
 #include "base/field_trial.h"
diff --git a/printing/printed_document_win.cc b/printing/printed_document_win.cc
index ac5008c..5d7ab5f 100644
--- a/printing/printed_document_win.cc
+++ b/printing/printed_document_win.cc
@@ -4,7 +4,6 @@
 
 #include "printing/printed_document.h"
 
-#include "app/win_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "gfx/font.h"
diff --git a/views/controls/button/native_button.cc b/views/controls/button/native_button.cc
index 402244c..542030a 100644
--- a/views/controls/button/native_button.cc
+++ b/views/controls/button/native_button.cc
@@ -9,7 +9,6 @@
 #include "views/screen.h"
 #endif
 
-#include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
diff --git a/views/controls/combobox/native_combobox_win.cc b/views/controls/combobox/native_combobox_win.cc
index 13f1912..a936b0c 100644
--- a/views/controls/combobox/native_combobox_win.cc
+++ b/views/controls/combobox/native_combobox_win.cc
@@ -1,11 +1,10 @@
-// Copyright (c) 2009 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.
+// Copyright (c) 2010 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 "views/controls/combobox/native_combobox_win.h"
 
 #include "app/combobox_model.h"
-#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "gfx/font.h"
diff --git a/views/controls/label.cc b/views/controls/label.cc
index e2f5091..b8d3adc 100644
--- a/views/controls/label.cc
+++ b/views/controls/label.cc
@@ -7,11 +7,11 @@
 #include <cmath>
 #include <limits>
 
-#include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/color_utils.h"
diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc
index 1c6d985..ef8ee2f 100644
--- a/views/controls/listbox/native_listbox_win.cc
+++ b/views/controls/listbox/native_listbox_win.cc
@@ -7,7 +7,6 @@
 #include <commctrl.h>
 #include <windowsx.h>
 
-#include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
diff --git a/views/controls/menu/menu_2.cc b/views/controls/menu/menu_2.cc
index 1c2bc29..cf12e2b 100644
--- a/views/controls/menu/menu_2.cc
+++ b/views/controls/menu/menu_2.cc
@@ -4,7 +4,6 @@
 
 #include "views/controls/menu/menu_2.h"
 
-#include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "views/controls/menu/menu_wrapper.h"
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
index 049a443..1e36a8c 100644
--- a/views/controls/menu/menu_item_view_win.cc
+++ b/views/controls/menu/menu_item_view_win.cc
@@ -7,7 +7,6 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "app/l10n_util.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/native_theme_win.h"
 #include "grit/app_strings.h"
diff --git a/views/controls/progress_bar.cc b/views/controls/progress_bar.cc
index 1006acd..e4fc467 100644
--- a/views/controls/progress_bar.cc
+++ b/views/controls/progress_bar.cc
@@ -6,8 +6,6 @@
 
 #include <string>
 
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "gfx/canvas_skia.h"
diff --git a/views/controls/progress_bar_unittest.cc b/views/controls/progress_bar_unittest.cc
index 2912744..bab166b1 100644
--- a/views/controls/progress_bar_unittest.cc
+++ b/views/controls/progress_bar_unittest.cc
@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/controls/progress_bar.h"
diff --git a/views/controls/scroll_view.cc b/views/controls/scroll_view.cc
index 33e096d..86e7a00 100644
--- a/views/controls/scroll_view.cc
+++ b/views/controls/scroll_view.cc
@@ -4,7 +4,6 @@
 
 #include "views/controls/scroll_view.h"
 
-#include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/widget/root_view.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
index 25705fc..39bb401 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc
@@ -6,7 +6,6 @@
 
 #include <gtk/gtk.h>
 
-#include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 799d89a..e47eda8 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
diff --git a/views/drag_utils.cc b/views/drag_utils.cc
index aff790a..6bec1a6 100644
--- a/views/drag_utils.cc
+++ b/views/drag_utils.cc
@@ -4,7 +4,6 @@
 
 #include "views/drag_utils.h"
 
-#include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/file_util.h"
diff --git a/views/focus/focus_manager_unittest.cc b/views/focus/focus_manager_unittest.cc
index 11e982a..4b23932 100644
--- a/views/focus/focus_manager_unittest.cc
+++ b/views/focus/focus_manager_unittest.cc
@@ -5,7 +5,6 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "app/combobox_model.h"
-#include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
 #include "base/logging.h"
 #include "base/string_util.h"
diff --git a/views/widget/tooltip_manager_win.cc b/views/widget/tooltip_manager_win.cc
index a8285da..5a1e4bf 100644
--- a/views/widget/tooltip_manager_win.cc
+++ b/views/widget/tooltip_manager_win.cc
@@ -7,7 +7,6 @@
 #include <windowsx.h>
 #include <limits>
 
-#include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index e67a5c2..ed83578 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -6,7 +6,6 @@
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
-#include "app/theme_provider.h"
 #if defined(OS_WIN)
 #include "app/win_util.h"
 #include "base/win_util.h"
diff --git a/views/window/non_client_view.cc b/views/window/non_client_view.cc
index cf3833e..620df29 100644
--- a/views/window/non_client_view.cc
+++ b/views/window/non_client_view.cc
@@ -4,14 +4,11 @@
 
 #include "views/window/non_client_view.h"
 
-#include "app/theme_provider.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
-#if defined(OS_WIN)
-#include "app/win_util.h"
-#else
+#if !defined(OS_WIN)
 #include "views/window/hit_test.h"
 #endif
 
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index f5ffab9..f4d00f7 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -4,7 +4,6 @@
 
 #include "views/window/window_gtk.h"
 
-#include "app/l10n_util.h"
 #include "gfx/rect.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
diff --git a/views/window/window_win.cc b/views/window/window_win.cc
index 4381e74..ac347f5 100644
--- a/views/window/window_win.cc
+++ b/views/window/window_win.cc
@@ -7,8 +7,6 @@
 #include <dwmapi.h>
 #include <shellapi.h>
 
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
 #include "app/theme_provider.h"
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"