summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/app_modal_dialog_gtk.cc2
-rw-r--r--chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc2
-rw-r--r--chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc1
-rw-r--r--chrome/browser/autofill/autofill_profile_unittest.cc2
-rw-r--r--chrome/browser/automation/automation_provider.cc1
-rw-r--r--chrome/browser/bookmarks/bookmark_drag_data.h1
-rw-r--r--chrome/browser/bookmarks/bookmark_utils.cc2
-rw-r--r--chrome/browser/browser_theme_pack_unittest.cc1
-rw-r--r--chrome/browser/bug_report_util.cc6
-rw-r--r--chrome/browser/cookie_modal_dialog_gtk.cc1
-rw-r--r--chrome/browser/cookies_tree_model.cc2
-rw-r--r--chrome/browser/cookies_tree_model_unittest.cc1
-rw-r--r--chrome/browser/debugger/devtools_window.cc1
-rw-r--r--chrome/browser/diagnostics/recon_diagnostics.cc1
-rw-r--r--chrome/browser/diagnostics/sqlite_diagnostics.cc1
-rw-r--r--chrome/browser/dom_ui/app_launcher_handler.cc3
-rw-r--r--chrome/browser/dom_ui/core_options_handler.cc1
-rw-r--r--chrome/browser/dom_ui/downloads_dom_handler.cc1
-rw-r--r--chrome/browser/dom_ui/fileicon_source.h2
-rw-r--r--chrome/browser/dom_ui/mediaplayer_ui.cc1
-rw-r--r--chrome/browser/dom_ui/options_ui.cc1
-rw-r--r--chrome/browser/dom_ui/personal_options_handler.cc3
-rw-r--r--chrome/browser/dom_ui/register_page_ui.cc1
-rw-r--r--chrome/browser/dom_ui/slideshow_ui.cc1
-rw-r--r--chrome/browser/dom_ui/sync_options_handler.cc1
-rw-r--r--chrome/browser/download/download_file.cc1
-rw-r--r--chrome/browser/extensions/extension_context_menu_browsertest.cc2
-rw-r--r--chrome/browser/extensions/extension_context_menu_model.cc1
-rw-r--r--chrome/browser/extensions/extension_infobar_module.cc2
-rw-r--r--chrome/browser/first_run_gtk.cc1
-rw-r--r--chrome/browser/history/archived_database.cc1
-rw-r--r--chrome/browser/history/download_database.cc1
-rw-r--r--chrome/browser/history/history.cc2
-rw-r--r--chrome/browser/history/starred_url_database.cc1
-rw-r--r--chrome/browser/history/text_database.cc1
-rw-r--r--chrome/browser/history/url_database.cc1
-rw-r--r--chrome/browser/history/visit_database.cc1
-rw-r--r--chrome/browser/history/visitsegment_database.cc1
-rw-r--r--chrome/browser/importer/importer_list.cc1
-rw-r--r--chrome/browser/language_order_table_model.cc1
-rw-r--r--chrome/browser/language_order_table_model.h3
-rw-r--r--chrome/browser/memory_details.cc2
-rw-r--r--chrome/browser/memory_details_linux.cc1
-rw-r--r--chrome/browser/net/sqlite_persistent_cookie_store.h5
-rw-r--r--chrome/browser/notifications/notification_exceptions_table_model.cc1
-rw-r--r--chrome/browser/omnibox_search_hint.cc1
-rw-r--r--chrome/browser/password_manager/password_manager.cc2
-rw-r--r--chrome/browser/platform_util_linux.cc1
-rw-r--r--chrome/browser/possible_url_model.cc1
-rw-r--r--chrome/browser/pref_value_store_unittest.cc1
-rw-r--r--chrome/browser/profile.cc1
-rw-r--r--chrome/browser/profile_manager.cc1
-rw-r--r--chrome/browser/renderer_host/render_view_host.cc2
-rw-r--r--chrome/browser/renderer_host/render_widget_host_painting_observer.h2
-rw-r--r--chrome/browser/renderer_host/resource_message_filter_gtk.cc1
-rw-r--r--chrome/browser/session_history_uitest.cc1
-rw-r--r--chrome/browser/ssl/ssl_policy.cc2
-rw-r--r--chrome/browser/sync/syncable/directory_backing_store_unittest.cc1
-rw-r--r--chrome/browser/tab_contents/navigation_controller.cc1
-rw-r--r--chrome/browser/tab_contents/render_view_context_menu.cc2
-rw-r--r--chrome/browser/tab_contents/tab_contents_view_gtk.cc1
-rw-r--r--chrome/browser/toolbar_model.cc1
-rw-r--r--chrome/browser/utility_process_host.cc1
-rw-r--r--chrome/browser/visitedlink_master.cc3
-rw-r--r--chrome/browser/wrench_menu_model.h4
65 files changed, 16 insertions, 84 deletions
diff --git a/chrome/browser/app_modal_dialog_gtk.cc b/chrome/browser/app_modal_dialog_gtk.cc
index 2eb9185..63bcc87 100644
--- a/chrome/browser/app_modal_dialog_gtk.cc
+++ b/chrome/browser/app_modal_dialog_gtk.cc
@@ -6,8 +6,6 @@
#include <gtk/gtk.h>
-#include "app/l10n_util.h"
-#include "app/message_box_flags.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
index 679d2f23..43ab216 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc
@@ -9,8 +9,6 @@
#include <algorithm>
-#include "app/clipboard/clipboard.h"
-#include "app/clipboard/scoped_clipboard_writer.h"
#include "app/l10n_util.h"
#include "base/gtk_util.h"
#include "base/logging.h"
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
index 8a6c24b..4d717d1 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_gtk.cc
@@ -9,7 +9,6 @@
#include <algorithm>
#include <string>
-#include "app/resource_bundle.h"
#include "base/basictypes.h"
#include "base/i18n/rtl.h"
#include "base/logging.h"
diff --git a/chrome/browser/autofill/autofill_profile_unittest.cc b/chrome/browser/autofill/autofill_profile_unittest.cc
index 2a0a6e8..5950585 100644
--- a/chrome/browser/autofill/autofill_profile_unittest.cc
+++ b/chrome/browser/autofill/autofill_profile_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/basictypes.h"
#include "base/scoped_ptr.h"
#include "base/stl_util-inl.h"
@@ -368,4 +367,3 @@ TEST(AutoFillProfileTest, MergeWith) {
}
} // namespace
-
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index e29f025..2e5d0fb 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -6,7 +6,6 @@
#include <set>
-#include "app/l10n_util.h"
#include "app/message_box_flags.h"
#include "base/callback.h"
#include "base/file_path.h"
diff --git a/chrome/browser/bookmarks/bookmark_drag_data.h b/chrome/browser/bookmarks/bookmark_drag_data.h
index d659f6e..1a23347 100644
--- a/chrome/browser/bookmarks/bookmark_drag_data.h
+++ b/chrome/browser/bookmarks/bookmark_drag_data.h
@@ -19,7 +19,6 @@
class BookmarkModel;
class BookmarkNode;
-class OSExchangeData;
class Pickle;
class Profile;
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 211c4e6..8003ea5 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "app/clipboard/clipboard.h"
#include "app/drag_drop_types.h"
#include "app/l10n_util.h"
#include "app/tree_node_iterator.h"
@@ -42,7 +41,6 @@
#include "views/widget/root_view.h"
#include "views/widget/widget.h"
#elif defined(TOOLKIT_GTK)
-#include "app/gtk_util.h"
#include "chrome/browser/gtk/custom_drag.h"
#endif
diff --git a/chrome/browser/browser_theme_pack_unittest.cc b/chrome/browser/browser_theme_pack_unittest.cc
index 001476c..eaeba79 100644
--- a/chrome/browser/browser_theme_pack_unittest.cc
+++ b/chrome/browser/browser_theme_pack_unittest.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/browser_theme_pack.h"
-#include "app/theme_provider.h"
#include "base/file_util.h"
#include "base/json/json_reader.h"
#include "base/message_loop.h"
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index 3f51fe7..0694593 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -4,8 +4,10 @@
#include "chrome/browser/bug_report_util.h"
-#include "app/l10n_util.h"
+#include <string>
+
#include "base/file_version_info.h"
+#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/profile.h"
@@ -18,8 +20,6 @@
#include "net/url_request/url_request_status.h"
#include "unicode/locid.h"
-#include <string>
-
namespace {
const int kBugReportVersion = 1;
diff --git a/chrome/browser/cookie_modal_dialog_gtk.cc b/chrome/browser/cookie_modal_dialog_gtk.cc
index f00dc19..7526697 100644
--- a/chrome/browser/cookie_modal_dialog_gtk.cc
+++ b/chrome/browser/cookie_modal_dialog_gtk.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/cookie_modal_dialog.h"
-#include "app/gtk_util.h"
#include "app/l10n_util.h"
#include "base/logging.h"
#include "base/string_util.h"
diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc
index d4d577b..67cc98b 100644
--- a/chrome/browser/cookies_tree_model.cc
+++ b/chrome/browser/cookies_tree_model.cc
@@ -10,8 +10,6 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
-#include "app/table_model_observer.h"
-#include "app/tree_node_model.h"
#include "base/callback.h"
#include "base/i18n/rtl.h"
#include "base/linked_ptr.h"
diff --git a/chrome/browser/cookies_tree_model_unittest.cc b/chrome/browser/cookies_tree_model_unittest.cc
index 793a9ac..c490922 100644
--- a/chrome/browser/cookies_tree_model_unittest.cc
+++ b/chrome/browser/cookies_tree_model_unittest.cc
@@ -6,7 +6,6 @@
#include <string>
-#include "app/l10n_util.h"
#include "chrome/browser/host_content_settings_map.h"
#include "chrome/browser/mock_browsing_data_appcache_helper.h"
#include "chrome/browser/mock_browsing_data_database_helper.h"
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index fc74431..00500a7 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.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/command_line.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/diagnostics/recon_diagnostics.cc b/chrome/browser/diagnostics/recon_diagnostics.cc
index 9f3e3d80..1f0ab8a 100644
--- a/chrome/browser/diagnostics/recon_diagnostics.cc
+++ b/chrome/browser/diagnostics/recon_diagnostics.cc
@@ -6,7 +6,6 @@
#include <string>
-#include "app/app_paths.h"
#include "base/file_util.h"
#include "base/file_version_info.h"
#include "base/json/json_reader.h"
diff --git a/chrome/browser/diagnostics/sqlite_diagnostics.cc b/chrome/browser/diagnostics/sqlite_diagnostics.cc
index d7f81fb..1e21c22 100644
--- a/chrome/browser/diagnostics/sqlite_diagnostics.cc
+++ b/chrome/browser/diagnostics/sqlite_diagnostics.cc
@@ -6,7 +6,6 @@
#include "app/sql/connection.h"
#include "app/sql/diagnostic_error_delegate.h"
-#include "app/sql/init_status.h"
#include "app/sql/statement.h"
#include "base/file_util.h"
#include "base/histogram.h"
diff --git a/chrome/browser/dom_ui/app_launcher_handler.cc b/chrome/browser/dom_ui/app_launcher_handler.cc
index ce6f273..6895f75 100644
--- a/chrome/browser/dom_ui/app_launcher_handler.cc
+++ b/chrome/browser/dom_ui/app_launcher_handler.cc
@@ -5,9 +5,8 @@
#include "chrome/browser/dom_ui/app_launcher_handler.h"
#include "app/animation.h"
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/base64.h"
+#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/app_launched_animation.h"
diff --git a/chrome/browser/dom_ui/core_options_handler.cc b/chrome/browser/dom_ui/core_options_handler.cc
index 5025e6f..e525080 100644
--- a/chrome/browser/dom_ui/core_options_handler.cc
+++ b/chrome/browser/dom_ui/core_options_handler.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/dom_ui/core_options_handler.h"
#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/common/notification_service.h"
diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/dom_ui/downloads_dom_handler.cc
index 126a8be..581ab20 100644
--- a/chrome/browser/dom_ui/downloads_dom_handler.cc
+++ b/chrome/browser/dom_ui/downloads_dom_handler.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/dom_ui/downloads_dom_handler.h"
-#include "app/l10n_util.h"
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/singleton.h"
diff --git a/chrome/browser/dom_ui/fileicon_source.h b/chrome/browser/dom_ui/fileicon_source.h
index 55fb038..b8e1d2f 100644
--- a/chrome/browser/dom_ui/fileicon_source.h
+++ b/chrome/browser/dom_ui/fileicon_source.h
@@ -8,11 +8,11 @@
#include <string>
-#include "app/resource_bundle.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
#include "chrome/browser/icon_manager.h"
class GURL;
+class RefCountedBytes;
// FileIconSource is the gateway between network-level chrome:
// requests for favicons and the history backend that serves these.
diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc
index 5cad6dc..eb8c515 100644
--- a/chrome/browser/dom_ui/mediaplayer_ui.cc
+++ b/chrome/browser/dom_ui/mediaplayer_ui.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/dom_ui/mediaplayer_ui.h"
-#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/logging.h"
#include "base/message_loop.h"
diff --git a/chrome/browser/dom_ui/options_ui.cc b/chrome/browser/dom_ui/options_ui.cc
index 8aa97de..c62473f 100644
--- a/chrome/browser/dom_ui/options_ui.cc
+++ b/chrome/browser/dom_ui/options_ui.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/callback.h"
#include "base/i18n/time_formatting.h"
diff --git a/chrome/browser/dom_ui/personal_options_handler.cc b/chrome/browser/dom_ui/personal_options_handler.cc
index 8e39ba5..444c8d1 100644
--- a/chrome/browser/dom_ui/personal_options_handler.cc
+++ b/chrome/browser/dom_ui/personal_options_handler.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/dom_ui/personal_options_handler.h"
#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/path_service.h"
@@ -34,7 +33,7 @@ void PersonalOptionsHandler::GetLocalizedValues(
DictionaryValue* localized_strings) {
DCHECK(localized_strings);
- //Personal Stuff page
+ // Personal Stuff page
localized_strings->SetString(L"sync_section",
l10n_util::GetString(IDS_SYNC_OPTIONS_GROUP_NAME));
localized_strings->SetString(L"sync_not_setup_info",
diff --git a/chrome/browser/dom_ui/register_page_ui.cc b/chrome/browser/dom_ui/register_page_ui.cc
index 7f6f196..1607654 100644
--- a/chrome/browser/dom_ui/register_page_ui.cc
+++ b/chrome/browser/dom_ui/register_page_ui.cc
@@ -6,7 +6,6 @@
#include <string>
-#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/callback.h"
#include "base/logging.h"
diff --git a/chrome/browser/dom_ui/slideshow_ui.cc b/chrome/browser/dom_ui/slideshow_ui.cc
index 79fab3b..f7bbd26 100644
--- a/chrome/browser/dom_ui/slideshow_ui.cc
+++ b/chrome/browser/dom_ui/slideshow_ui.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/dom_ui/slideshow_ui.h"
-#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/callback.h"
#include "base/logging.h"
diff --git a/chrome/browser/dom_ui/sync_options_handler.cc b/chrome/browser/dom_ui/sync_options_handler.cc
index 8378a13..9341429 100644
--- a/chrome/browser/dom_ui/sync_options_handler.cc
+++ b/chrome/browser/dom_ui/sync_options_handler.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/dom_ui/sync_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/download/download_file.cc b/chrome/browser/download/download_file.cc
index 111236b..3c3b6d9 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -13,7 +13,6 @@
#include "net/base/net_errors.h"
#if defined(OS_WIN)
-#include "app/win_util.h"
#include "chrome/common/win_safe_util.h"
#elif defined(OS_MACOSX)
#include "chrome/browser/cocoa/file_metadata.h"
diff --git a/chrome/browser/extensions/extension_context_menu_browsertest.cc b/chrome/browser/extensions/extension_context_menu_browsertest.cc
index 3eb058f..705f98b 100644
--- a/chrome/browser/extensions/extension_context_menu_browsertest.cc
+++ b/chrome/browser/extensions/extension_context_menu_browsertest.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/menus/menu_model.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/extensions/extension_browsertest.h"
@@ -13,7 +12,6 @@
#include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h"
#include "webkit/glue/context_menu.h"
-using menus::MenuModel;
using WebKit::WebContextMenuData;
// This test class helps us sidestep platform-specific issues with popping up a
diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc
index a13361c..d83cb0c 100644
--- a/chrome/browser/extensions/extension_context_menu_model.cc
+++ b/chrome/browser/extensions/extension_context_menu_model.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/extension_context_menu_model.h"
-#include "app/l10n_util.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extension_tabs_module.h"
diff --git a/chrome/browser/extensions/extension_infobar_module.cc b/chrome/browser/extensions/extension_infobar_module.cc
index 2143d89..8ca5605 100644
--- a/chrome/browser/extensions/extension_infobar_module.cc
+++ b/chrome/browser/extensions/extension_infobar_module.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/extensions/extension_infobar_module.h"
-#include "app/l10n_util.h"
+#include "base/string_util.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_infobar_module_constants.h"
diff --git a/chrome/browser/first_run_gtk.cc b/chrome/browser/first_run_gtk.cc
index 0142c7e..f675732 100644
--- a/chrome/browser/first_run_gtk.cc
+++ b/chrome/browser/first_run_gtk.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/first_run.h"
#include "app/app_switches.h"
-#include "app/resource_bundle.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/path_service.h"
diff --git a/chrome/browser/history/archived_database.cc b/chrome/browser/history/archived_database.cc
index 1b9e010..777ee4d 100644
--- a/chrome/browser/history/archived_database.cc
+++ b/chrome/browser/history/archived_database.cc
@@ -5,7 +5,6 @@
#include <algorithm>
#include <string>
-#include "app/sql/statement.h"
#include "app/sql/transaction.h"
#include "base/string_util.h"
#include "chrome/browser/history/archived_database.h"
diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc
index aa3dbde..62853a8 100644
--- a/chrome/browser/history/download_database.cc
+++ b/chrome/browser/history/download_database.cc
@@ -7,7 +7,6 @@
#include <limits>
#include <vector>
-#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "base/file_path.h"
#include "base/utf_string_conversions.h"
diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc
index 0b92b6f..aaec4207 100644
--- a/chrome/browser/history/history.cc
+++ b/chrome/browser/history/history.cc
@@ -24,11 +24,11 @@
#include "chrome/browser/history/history.h"
-#include "app/l10n_util.h"
#include "base/callback.h"
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/ref_counted.h"
+#include "base/string_util.h"
#include "base/task.h"
#include "chrome/browser/autocomplete/history_url_provider.h"
#include "chrome/browser/browser_list.h"
diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
index cf2a306..2ba3156 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/history/starred_url_database.h"
-#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "base/file_util.h"
#include "base/logging.h"
diff --git a/chrome/browser/history/text_database.cc b/chrome/browser/history/text_database.cc
index 3327869..f2ae15b 100644
--- a/chrome/browser/history/text_database.cc
+++ b/chrome/browser/history/text_database.cc
@@ -8,7 +8,6 @@
#include "chrome/browser/history/text_database.h"
-#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "app/sql/transaction.h"
#include "base/file_util.h"
diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc
index 07f8881..3c4e3be 100644
--- a/chrome/browser/history/url_database.cc
+++ b/chrome/browser/history/url_database.cc
@@ -10,7 +10,6 @@
#include <vector>
#include "app/l10n_util.h"
-#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/url_constants.h"
diff --git a/chrome/browser/history/visit_database.cc b/chrome/browser/history/visit_database.cc
index 80fa8c8..75c91ee 100644
--- a/chrome/browser/history/visit_database.cc
+++ b/chrome/browser/history/visit_database.cc
@@ -9,7 +9,6 @@
#include <map>
#include <set>
-#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "base/logging.h"
#include "chrome/browser/history/url_database.h"
diff --git a/chrome/browser/history/visitsegment_database.cc b/chrome/browser/history/visitsegment_database.cc
index f94d713..f4c4f9f 100644
--- a/chrome/browser/history/visitsegment_database.cc
+++ b/chrome/browser/history/visitsegment_database.cc
@@ -10,7 +10,6 @@
#include <string>
#include <vector>
-#include "app/sql/connection.h"
#include "app/sql/statement.h"
#include "base/logging.h"
#include "base/stl_util-inl.h"
diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc
index 0919489..c84cc41 100644
--- a/chrome/browser/importer/importer_list.cc
+++ b/chrome/browser/importer/importer_list.cc
@@ -19,7 +19,6 @@
#include "grit/generated_resources.h"
#if defined(OS_WIN)
-#include "app/win_util.h"
#include "chrome/browser/importer/ie_importer.h"
#include "chrome/browser/password_manager/ie7_password.h"
#endif
diff --git a/chrome/browser/language_order_table_model.cc b/chrome/browser/language_order_table_model.cc
index 2655378..eadebe9 100644
--- a/chrome/browser/language_order_table_model.cc
+++ b/chrome/browser/language_order_table_model.cc
@@ -7,6 +7,7 @@
#include <set>
#include "app/l10n_util.h"
+#include "app/table_model_observer.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/language_order_table_model.h b/chrome/browser/language_order_table_model.h
index 2ca12b2..0d9234d 100644
--- a/chrome/browser/language_order_table_model.h
+++ b/chrome/browser/language_order_table_model.h
@@ -10,7 +10,8 @@
#include <vector>
#include "app/table_model.h"
-#include "app/table_model_observer.h"
+
+class TableModelObserver;
class LanguageOrderTableModel : public TableModel {
public:
diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc
index 5c38d97..569cbbc 100644
--- a/chrome/browser/memory_details.cc
+++ b/chrome/browser/memory_details.cc
@@ -4,10 +4,10 @@
#include "chrome/browser/memory_details.h"
-#include "app/l10n_util.h"
#include "base/file_version_info.h"
#include "base/histogram.h"
#include "base/process_util.h"
+#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_child_process_host.h"
#include "chrome/browser/chrome_thread.h"
diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc
index bca8a75..78a9065 100644
--- a/chrome/browser/memory_details_linux.cc
+++ b/chrome/browser/memory_details_linux.cc
@@ -8,7 +8,6 @@
#include <fcntl.h>
#include <dirent.h>
-#include "app/l10n_util.h"
#include "base/eintr_wrapper.h"
#include "base/file_version_info.h"
#include "base/string_util.h"
diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h
index aa9d9a5..998965d 100644
--- a/chrome/browser/net/sqlite_persistent_cookie_store.h
+++ b/chrome/browser/net/sqlite_persistent_cookie_store.h
@@ -11,12 +11,15 @@
#include <string>
#include <vector>
-#include "app/sql/connection.h"
#include "app/sql/meta_table.h"
#include "base/file_path.h"
#include "base/ref_counted.h"
#include "net/base/cookie_monster.h"
+namespace sql {
+class Connection;
+}
+
class FilePath;
class SQLitePersistentCookieStore
diff --git a/chrome/browser/notifications/notification_exceptions_table_model.cc b/chrome/browser/notifications/notification_exceptions_table_model.cc
index fdb08f4..26270252 100644
--- a/chrome/browser/notifications/notification_exceptions_table_model.cc
+++ b/chrome/browser/notifications/notification_exceptions_table_model.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/notifications/notification_exceptions_table_model.h"
#include "app/l10n_util.h"
-#include "app/l10n_util_collator.h"
#include "app/table_model_observer.h"
#include "base/utf_string_conversions.h"
#include "chrome/common/content_settings_helper.h"
diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc
index c54794c..c995294 100644
--- a/chrome/browser/omnibox_search_hint.cc
+++ b/chrome/browser/omnibox_search_hint.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/omnibox_search_hint.h"
-#include "app/animation.h"
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/command_line.h"
diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc
index 258a254..be4e7a1 100644
--- a/chrome/browser/password_manager/password_manager.cc
+++ b/chrome/browser/password_manager/password_manager.cc
@@ -6,8 +6,6 @@
#include <vector>
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/platform_thread.h"
#include "base/stl_util-inl.h"
#include "base/utf_string_conversions.h"
diff --git a/chrome/browser/platform_util_linux.cc b/chrome/browser/platform_util_linux.cc
index 38ffba6..7f4627c 100644
--- a/chrome/browser/platform_util_linux.cc
+++ b/chrome/browser/platform_util_linux.cc
@@ -6,7 +6,6 @@
#include <gtk/gtk.h>
-#include "app/gtk_util.h"
#include "base/file_util.h"
#include "base/process_util.h"
#include "base/utf_string_conversions.h"
diff --git a/chrome/browser/possible_url_model.cc b/chrome/browser/possible_url_model.cc
index 2240975..c4a8561 100644
--- a/chrome/browser/possible_url_model.cc
+++ b/chrome/browser/possible_url_model.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/possible_url_model.h"
-#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "app/table_model_observer.h"
#include "base/callback.h"
diff --git a/chrome/browser/pref_value_store_unittest.cc b/chrome/browser/pref_value_store_unittest.cc
index bd10e7b..282f305 100644
--- a/chrome/browser/pref_value_store_unittest.cc
+++ b/chrome/browser/pref_value_store_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/test/data/resource.h"
#include "base/scoped_ptr.h"
#include "base/values.h"
#include "chrome/browser/dummy_pref_store.h"
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 98ad2863..4c1a613 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/profile.h"
#include "app/resource_bundle.h"
-#include "app/theme_provider.h"
#include "base/command_line.h"
#include "base/env_var.h"
#include "base/file_path.h"
diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc
index 383dd5e..bb0a721 100644
--- a/chrome/browser/profile_manager.cc
+++ b/chrome/browser/profile_manager.cc
@@ -6,7 +6,6 @@
#include "chrome/browser/profile_manager.h"
-#include "app/l10n_util.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/path_service.h"
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc
index 54cae39..ccaa30a 100644
--- a/chrome/browser/renderer_host/render_view_host.cc
+++ b/chrome/browser/renderer_host/render_view_host.cc
@@ -8,7 +8,6 @@
#include <utility>
#include <vector>
-#include "app/resource_bundle.h"
#include "base/i18n/rtl.h"
#include "base/json/json_reader.h"
#include "base/stats_counters.h"
@@ -1981,4 +1980,3 @@ void RenderViewHost::OnWebDatabaseAccessed(const GURL& url,
void RenderViewHost::OnSetDisplayingPDFContent() {
delegate_->SetDisplayingPDFContent();
}
-
diff --git a/chrome/browser/renderer_host/render_widget_host_painting_observer.h b/chrome/browser/renderer_host/render_widget_host_painting_observer.h
index 9a58c37..8b3da5e 100644
--- a/chrome/browser/renderer_host/render_widget_host_painting_observer.h
+++ b/chrome/browser/renderer_host/render_widget_host_painting_observer.h
@@ -6,8 +6,6 @@
#define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_PAINTING_OBSERVER_H_
#pragma once
-#include "app/surface/transport_dib.h"
-
class BackingStore;
class RenderWidgetHost;
class SkBitmap;
diff --git a/chrome/browser/renderer_host/resource_message_filter_gtk.cc b/chrome/browser/renderer_host/resource_message_filter_gtk.cc
index dcd3d19..5562e46 100644
--- a/chrome/browser/renderer_host/resource_message_filter_gtk.cc
+++ b/chrome/browser/renderer_host/resource_message_filter_gtk.cc
@@ -8,7 +8,6 @@
#include <map>
#include "app/clipboard/clipboard.h"
-#include "app/l10n_util.h"
#include "app/x11_util.h"
#include "base/file_util.h"
#include "base/path_service.h"
diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc
index 368ad0b..1082f30 100644
--- a/chrome/browser/session_history_uitest.cc
+++ b/chrome/browser/session_history_uitest.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/file_path.h"
#include "base/platform_thread.h"
#include "base/string_util.h"
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index ea1ff71..d1258cc 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -4,8 +4,6 @@
#include "chrome/browser/ssl/ssl_policy.h"
-#include "app/l10n_util.h"
-#include "app/resource_bundle.h"
#include "base/base_switches.h"
#include "base/command_line.h"
#include "base/i18n/rtl.h"
diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
index 365612c..972b5cd 100644
--- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
+++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc
@@ -8,7 +8,6 @@
#include "app/sql/connection.h"
#include "app/sql/statement.h"
-#include "app/sql/transaction.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/scoped_ptr.h"
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc
index 5b0e157..fcc1e7a 100644
--- a/chrome/browser/tab_contents/navigation_controller.cc
+++ b/chrome/browser/tab_contents/navigation_controller.cc
@@ -4,7 +4,6 @@
#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"
diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc
index 4f8d317..64e69e6 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.cc
+++ b/chrome/browser/tab_contents/render_view_context_menu.cc
@@ -7,8 +7,6 @@
#include "chrome/browser/tab_contents/render_view_context_menu.h"
-#include "app/clipboard/clipboard.h"
-#include "app/clipboard/scoped_clipboard_writer.h"
#include "app/l10n_util.h"
#include "base/command_line.h"
#include "base/histogram.h"
diff --git a/chrome/browser/tab_contents/tab_contents_view_gtk.cc b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
index 68243cd..9787050 100644
--- a/chrome/browser/tab_contents/tab_contents_view_gtk.cc
+++ b/chrome/browser/tab_contents/tab_contents_view_gtk.cc
@@ -8,7 +8,6 @@
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
-#include "app/gtk_dnd_util.h"
#include "base/pickle.h"
#include "base/string_util.h"
#include "build/build_config.h"
diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc
index b7a42ed..ca6a75e 100644
--- a/chrome/browser/toolbar_model.cc
+++ b/chrome/browser/toolbar_model.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/toolbar_model.h"
-#include "app/l10n_util.h"
#include "chrome/browser/autocomplete/autocomplete_edit.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/cert_store.h"
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index 6a4a7fd..857c38d 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/utility_process_host.h"
#include "app/app_switches.h"
-#include "app/l10n_util.h"
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/message_loop.h"
diff --git a/chrome/browser/visitedlink_master.cc b/chrome/browser/visitedlink_master.cc
index 606261f..7e4d553 100644
--- a/chrome/browser/visitedlink_master.cc
+++ b/chrome/browser/visitedlink_master.cc
@@ -13,9 +13,6 @@
#include <algorithm>
-#if defined(OS_WIN)
-#include "app/win_util.h"
-#endif
#include "base/file_util.h"
#include "base/logging.h"
#include "base/message_loop.h"
diff --git a/chrome/browser/wrench_menu_model.h b/chrome/browser/wrench_menu_model.h
index f8eece1..9962c62 100644
--- a/chrome/browser/wrench_menu_model.h
+++ b/chrome/browser/wrench_menu_model.h
@@ -19,10 +19,6 @@
class Browser;
-namespace menus {
-class ButtonMenuItemModel;
-} // namespace menus
-
namespace {
class MockWrenchMenuModel;
} // namespace