summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 23:48:54 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-10 23:48:54 +0000
commit9e790bdb7aabd7849243158d7095fb79dc26262c (patch)
tree2d41c8b2c0b79e19a686927e2c5d89849872de13 /chrome/browser/views
parent5d6fe75abc0414d83319ce7668d7245b05e424b5 (diff)
downloadchromium_src-9e790bdb7aabd7849243158d7095fb79dc26262c.zip
chromium_src-9e790bdb7aabd7849243158d7095fb79dc26262c.tar.gz
chromium_src-9e790bdb7aabd7849243158d7095fb79dc26262c.tar.bz2
Remove the stubbed out headers in chrome/browser/views.
Update references to use headers in chrome/browser/ui/views. Update copyright dates in affected files. /chrome/browser/ui/views/constrained_html_delegate_win.cc Add space before 'private' label (presubmit warning) /chrome/browser/ui/views/toolbar_view.cc Add space before 'cleanup' label (presubmit warning) BUG=69082 TEST=Compiling... Review URL: http://codereview.chromium.org/6204002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70965 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/about_chrome_view.h13
-rw-r--r--chrome/browser/views/about_ipc_dialog.h13
-rw-r--r--chrome/browser/views/accelerator_table_gtk.h13
-rw-r--r--chrome/browser/views/accessibility_event_router_views.h13
-rw-r--r--chrome/browser/views/accessible_pane_view.h13
-rw-r--r--chrome/browser/views/accessible_view_helper.h13
-rw-r--r--chrome/browser/views/appcache_info_view.h13
-rw-r--r--chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h13
-rw-r--r--chrome/browser/views/autocomplete/autocomplete_popup_gtk.h13
-rw-r--r--chrome/browser/views/autocomplete/autocomplete_popup_win.h13
-rw-r--r--chrome/browser/views/autofill_profiles_view_win.h13
-rw-r--r--chrome/browser/views/bookmark_bar_instructions_view.h13
-rw-r--r--chrome/browser/views/bookmark_bar_view.h13
-rw-r--r--chrome/browser/views/bookmark_bubble_view.h13
-rw-r--r--chrome/browser/views/bookmark_context_menu.h13
-rw-r--r--chrome/browser/views/bookmark_context_menu_controller_views.h13
-rw-r--r--chrome/browser/views/bookmark_editor_view.h13
-rw-r--r--chrome/browser/views/bookmark_menu_controller_views.h13
-rw-r--r--chrome/browser/views/browser_actions_container.h13
-rw-r--r--chrome/browser/views/browser_bubble.h13
-rw-r--r--chrome/browser/views/browser_dialogs.h13
-rw-r--r--chrome/browser/views/bubble_border.h13
-rw-r--r--chrome/browser/views/chrome_views_delegate.h13
-rw-r--r--chrome/browser/views/clear_browsing_data.h13
-rw-r--r--chrome/browser/views/clear_browsing_data_view.h13
-rw-r--r--chrome/browser/views/clear_data_view.h13
-rw-r--r--chrome/browser/views/clear_server_data.h13
-rw-r--r--chrome/browser/views/collected_cookies_win.h13
-rw-r--r--chrome/browser/views/confirm_message_box_dialog.h13
-rw-r--r--chrome/browser/views/constrained_window_win.h13
-rw-r--r--chrome/browser/views/content_setting_bubble_contents.h13
-rw-r--r--chrome/browser/views/cookie_info_view.h13
-rw-r--r--chrome/browser/views/create_application_shortcut_view.h13
-rw-r--r--chrome/browser/views/database_info_view.h13
-rw-r--r--chrome/browser/views/database_open_info_view.h13
-rw-r--r--chrome/browser/views/default_search_view.h13
-rw-r--r--chrome/browser/views/detachable_toolbar_view.h13
-rw-r--r--chrome/browser/views/dom_view.h13
-rw-r--r--chrome/browser/views/download_item_view.h13
-rw-r--r--chrome/browser/views/download_shelf_view.h13
-rw-r--r--chrome/browser/views/dropdown_bar_host.h13
-rw-r--r--chrome/browser/views/dropdown_bar_view.h13
-rw-r--r--chrome/browser/views/edit_search_engine_dialog.h13
-rw-r--r--chrome/browser/views/event_utils.h13
-rw-r--r--chrome/browser/views/extensions/browser_action_drag_data.h13
-rw-r--r--chrome/browser/views/extensions/browser_action_overflow_menu_controller.h13
-rw-r--r--chrome/browser/views/extensions/extension_installed_bubble.h13
-rw-r--r--chrome/browser/views/extensions/extension_popup.h13
-rw-r--r--chrome/browser/views/extensions/extension_view.h13
-rw-r--r--chrome/browser/views/external_protocol_dialog.h13
-rw-r--r--chrome/browser/views/find_bar_host.h13
-rw-r--r--chrome/browser/views/find_bar_view.h13
-rw-r--r--chrome/browser/views/first_run_bubble.h13
-rw-r--r--chrome/browser/views/first_run_search_engine_view.h13
-rw-r--r--chrome/browser/views/frame/app_panel_browser_frame_view.h13
-rw-r--r--chrome/browser/views/frame/browser_bubble_host.h13
-rw-r--r--chrome/browser/views/frame/browser_frame.h13
-rw-r--r--chrome/browser/views/frame/browser_frame_gtk.h13
-rw-r--r--chrome/browser/views/frame/browser_frame_win.h13
-rw-r--r--chrome/browser/views/frame/browser_non_client_frame_view.h13
-rw-r--r--chrome/browser/views/frame/browser_root_view.h13
-rw-r--r--chrome/browser/views/frame/browser_view.h13
-rw-r--r--chrome/browser/views/frame/browser_view_layout.h13
-rw-r--r--chrome/browser/views/frame/contents_container.h13
-rw-r--r--chrome/browser/views/frame/glass_browser_frame_view.h13
-rw-r--r--chrome/browser/views/frame/opaque_browser_frame_view.h13
-rw-r--r--chrome/browser/views/frame/popup_non_client_frame_view.h13
-rw-r--r--chrome/browser/views/fullscreen_exit_bubble.h13
-rw-r--r--chrome/browser/views/generic_info_view.h13
-rw-r--r--chrome/browser/views/html_dialog_view.h13
-rw-r--r--chrome/browser/views/importer_lock_view.h13
-rw-r--r--chrome/browser/views/importer_view.h13
-rw-r--r--chrome/browser/views/importing_progress_view.h13
-rw-r--r--chrome/browser/views/indexed_db_info_view.h13
-rw-r--r--chrome/browser/views/info_bubble.h13
-rw-r--r--chrome/browser/views/infobars/after_translate_infobar.h13
-rw-r--r--chrome/browser/views/infobars/before_translate_infobar.h13
-rw-r--r--chrome/browser/views/infobars/extension_infobar.h13
-rw-r--r--chrome/browser/views/infobars/infobar_button_border.h13
-rw-r--r--chrome/browser/views/infobars/infobar_container.h13
-rw-r--r--chrome/browser/views/infobars/infobar_text_button.h13
-rw-r--r--chrome/browser/views/infobars/infobars.h13
-rw-r--r--chrome/browser/views/infobars/translate_infobar_base.h13
-rw-r--r--chrome/browser/views/infobars/translate_message_infobar.h13
-rw-r--r--chrome/browser/views/instant_confirm_view.h13
-rw-r--r--chrome/browser/views/js_modal_dialog_views.h13
-rw-r--r--chrome/browser/views/keyword_editor_view.h13
-rw-r--r--chrome/browser/views/list_background.h13
-rw-r--r--chrome/browser/views/local_storage_info_view.h13
-rw-r--r--chrome/browser/views/local_storage_set_item_info_view.h13
-rw-r--r--chrome/browser/views/location_bar/click_handler.h13
-rw-r--r--chrome/browser/views/location_bar/content_setting_image_view.h13
-rw-r--r--chrome/browser/views/location_bar/ev_bubble_view.h13
-rw-r--r--chrome/browser/views/location_bar/icon_label_bubble_view.h13
-rw-r--r--chrome/browser/views/location_bar/keyword_hint_view.h13
-rw-r--r--chrome/browser/views/location_bar/location_bar_view.h13
-rw-r--r--chrome/browser/views/location_bar/location_icon_view.h13
-rw-r--r--chrome/browser/views/location_bar/page_action_image_view.h13
-rw-r--r--chrome/browser/views/location_bar/page_action_with_badge_view.h13
-rw-r--r--chrome/browser/views/location_bar/selected_keyword_view.h13
-rw-r--r--chrome/browser/views/location_bar/star_view.h13
-rw-r--r--chrome/browser/views/login_view.h13
-rw-r--r--chrome/browser/views/modal_dialog_delegate.h13
-rw-r--r--chrome/browser/views/notifications/balloon_view.h13
-rw-r--r--chrome/browser/views/notifications/balloon_view_host.h13
-rw-r--r--chrome/browser/views/options/advanced_contents_view.h13
-rw-r--r--chrome/browser/views/options/advanced_page_view.h13
-rw-r--r--chrome/browser/views/options/content_exceptions_table_view.h13
-rw-r--r--chrome/browser/views/options/content_filter_page_view.h13
-rw-r--r--chrome/browser/views/options/content_page_view.h13
-rw-r--r--chrome/browser/views/options/content_settings_window_view.h13
-rw-r--r--chrome/browser/views/options/cookie_filter_page_view.h13
-rw-r--r--chrome/browser/views/options/cookies_view.h13
-rw-r--r--chrome/browser/views/options/exception_editor_view.h13
-rw-r--r--chrome/browser/views/options/exceptions_page_view.h13
-rw-r--r--chrome/browser/views/options/exceptions_view.h13
-rw-r--r--chrome/browser/views/options/fonts_languages_window_view.h13
-rw-r--r--chrome/browser/views/options/fonts_page_view.h13
-rw-r--r--chrome/browser/views/options/general_page_view.h13
-rw-r--r--chrome/browser/views/options/languages_page_view.h13
-rw-r--r--chrome/browser/views/options/managed_prefs_banner_view.h13
-rw-r--r--chrome/browser/views/options/options_group_view.h13
-rw-r--r--chrome/browser/views/options/options_page_view.h13
-rw-r--r--chrome/browser/views/options/passwords_exceptions_window_view.h13
-rw-r--r--chrome/browser/views/options/passwords_page_view.h13
-rw-r--r--chrome/browser/views/options/plugin_filter_page_view.h13
-rw-r--r--chrome/browser/views/options/simple_content_exceptions_view.h13
-rw-r--r--chrome/browser/views/page_info_bubble_view.h13
-rw-r--r--chrome/browser/views/pinned_contents_info_bubble.h13
-rw-r--r--chrome/browser/views/reload_button.h13
-rw-r--r--chrome/browser/views/repost_form_warning_view.h13
-rw-r--r--chrome/browser/views/restart_message_box.h13
-rw-r--r--chrome/browser/views/sad_tab_view.h13
-rw-r--r--chrome/browser/views/status_bubble_views.h13
-rw-r--r--chrome/browser/views/status_icons/status_icon_win.h13
-rw-r--r--chrome/browser/views/status_icons/status_tray_win.h13
-rw-r--r--chrome/browser/views/tab_contents/native_tab_contents_container.h13
-rw-r--r--chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h13
-rw-r--r--chrome/browser/views/tab_contents/native_tab_contents_container_win.h13
-rw-r--r--chrome/browser/views/tab_contents/render_view_context_menu_views.h13
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_container.h13
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_drag_win.h13
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_view_gtk.h13
-rw-r--r--chrome/browser/views/tab_contents/tab_contents_view_win.h13
-rw-r--r--chrome/browser/views/tab_icon_view.h13
-rw-r--r--chrome/browser/views/tabs/base_tab.h13
-rw-r--r--chrome/browser/views/tabs/base_tab_strip.h13
-rw-r--r--chrome/browser/views/tabs/browser_tab_strip_controller.h13
-rw-r--r--chrome/browser/views/tabs/dragged_tab_controller.h13
-rw-r--r--chrome/browser/views/tabs/dragged_tab_view.h13
-rw-r--r--chrome/browser/views/tabs/native_view_photobooth.h13
-rw-r--r--chrome/browser/views/tabs/native_view_photobooth_gtk.h13
-rw-r--r--chrome/browser/views/tabs/native_view_photobooth_win.h13
-rw-r--r--chrome/browser/views/tabs/side_tab.h13
-rw-r--r--chrome/browser/views/tabs/side_tab_strip.h13
-rw-r--r--chrome/browser/views/tabs/tab.h13
-rw-r--r--chrome/browser/views/tabs/tab_controller.h13
-rw-r--r--chrome/browser/views/tabs/tab_renderer_data.h13
-rw-r--r--chrome/browser/views/tabs/tab_strip.h13
-rw-r--r--chrome/browser/views/tabs/tab_strip_controller.h13
-rw-r--r--chrome/browser/views/textfield_views.h13
-rw-r--r--chrome/browser/views/theme_background.h13
-rw-r--r--chrome/browser/views/theme_helpers.h13
-rw-r--r--chrome/browser/views/theme_install_bubble_view.h13
-rw-r--r--chrome/browser/views/toolbar_view.h12
-rw-r--r--chrome/browser/views/unhandled_keyboard_event_handler.h13
-rw-r--r--chrome/browser/views/uninstall_view.h13
-rw-r--r--chrome/browser/views/update_recommended_message_box.h13
-rw-r--r--chrome/browser/views/url_picker.h13
-rw-r--r--chrome/browser/views/user_data_dir_dialog.h13
-rw-r--r--chrome/browser/views/window.h13
-rw-r--r--chrome/browser/views/wrench_menu.h13
172 files changed, 0 insertions, 2235 deletions
diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h
deleted file mode 100644
index cb2a7dd6..0000000
--- a/chrome/browser/views/about_chrome_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_
-#define CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/about_chrome_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_
-
diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h
deleted file mode 100644
index 13c1255..0000000
--- a/chrome/browser/views/about_ipc_dialog.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_
-#define CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_
-#pragma once
-
-#include "chrome/browser/ui/views/about_ipc_dialog.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_
-
diff --git a/chrome/browser/views/accelerator_table_gtk.h b/chrome/browser/views/accelerator_table_gtk.h
deleted file mode 100644
index 1b3a20a..0000000
--- a/chrome/browser/views/accelerator_table_gtk.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_ACCELERATOR_TABLE_GTK_H_
-#define CHROME_BROWSER_VIEWS_ACCELERATOR_TABLE_GTK_H_
-#pragma once
-
-#include "chrome/browser/ui/views/accelerator_table_gtk.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_ACCELERATOR_TABLE_GTK_H_
-
diff --git a/chrome/browser/views/accessibility_event_router_views.h b/chrome/browser/views/accessibility_event_router_views.h
deleted file mode 100644
index e3850b2..0000000
--- a/chrome/browser/views/accessibility_event_router_views.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_
-#define CHROME_BROWSER_VIEWS_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/accessibility_event_router_views.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_ACCESSIBILITY_EVENT_ROUTER_VIEWS_H_
-
diff --git a/chrome/browser/views/accessible_pane_view.h b/chrome/browser/views/accessible_pane_view.h
deleted file mode 100644
index 8a2ebb1..0000000
--- a/chrome/browser/views/accessible_pane_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_ACCESSIBLE_PANE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_ACCESSIBLE_PANE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/accessible_pane_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_ACCESSIBLE_PANE_VIEW_H_
-
diff --git a/chrome/browser/views/accessible_view_helper.h b/chrome/browser/views/accessible_view_helper.h
deleted file mode 100644
index e02fde1..0000000
--- a/chrome/browser/views/accessible_view_helper.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_ACCESSIBLE_VIEW_HELPER_H_
-#define CHROME_BROWSER_VIEWS_ACCESSIBLE_VIEW_HELPER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/accessible_view_helper.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_ACCESSIBLE_VIEW_HELPER_H_
-
diff --git a/chrome/browser/views/appcache_info_view.h b/chrome/browser/views/appcache_info_view.h
deleted file mode 100644
index 991b819..0000000
--- a/chrome/browser/views/appcache_info_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_APPCACHE_INFO_VIEW_H_
-#define CHROME_BROWSER_VIEWS_APPCACHE_INFO_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/appcache_info_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_APPCACHE_INFO_VIEW_H_
-
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
deleted file mode 100644
index 770818d..0000000
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
-#define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_CONTENTS_VIEW_H_
-
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h b/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h
deleted file mode 100644
index f3a156f..0000000
--- a/chrome/browser/views/autocomplete/autocomplete_popup_gtk.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_GTK_H_
-#define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_GTK_H_
-#pragma once
-
-#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_gtk.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_GTK_H_
-
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_win.h b/chrome/browser/views/autocomplete/autocomplete_popup_win.h
deleted file mode 100644
index 68fa02c..0000000
--- a/chrome/browser/views/autocomplete/autocomplete_popup_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
-#define CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/autocomplete/autocomplete_popup_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_AUTOCOMPLETE_AUTOCOMPLETE_POPUP_WIN_H_
-
diff --git a/chrome/browser/views/autofill_profiles_view_win.h b/chrome/browser/views/autofill_profiles_view_win.h
deleted file mode 100644
index 5768e9f..0000000
--- a/chrome/browser/views/autofill_profiles_view_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_
-#define CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/autofill_profiles_view_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_AUTOFILL_PROFILES_VIEW_WIN_H_
-
diff --git a/chrome/browser/views/bookmark_bar_instructions_view.h b/chrome/browser/views/bookmark_bar_instructions_view.h
deleted file mode 100644
index 599ad78..0000000
--- a/chrome/browser/views/bookmark_bar_instructions_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
-#define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/bookmark_bar_instructions_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_INSTRUCTIONS_VIEW_H_
-
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
deleted file mode 100644
index 7dea837..0000000
--- a/chrome/browser/views/bookmark_bar_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/bookmark_bar_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
-
diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h
deleted file mode 100644
index cd35459..0000000
--- a/chrome/browser/views/bookmark_bubble_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/bookmark_bubble_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BOOKMARK_BUBBLE_VIEW_H_
-
diff --git a/chrome/browser/views/bookmark_context_menu.h b/chrome/browser/views/bookmark_context_menu.h
deleted file mode 100644
index 1f6f2f2..0000000
--- a/chrome/browser/views/bookmark_context_menu.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_H_
-#define CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_H_
-#pragma once
-
-#include "chrome/browser/ui/views/bookmark_context_menu.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_H_
-
diff --git a/chrome/browser/views/bookmark_context_menu_controller_views.h b/chrome/browser/views/bookmark_context_menu_controller_views.h
deleted file mode 100644
index 73b54e6..0000000
--- a/chrome/browser/views/bookmark_context_menu_controller_views.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
-#define CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/bookmark_context_menu_controller_views.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BOOKMARK_CONTEXT_MENU_CONTROLLER_VIEWS_H_
-
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
deleted file mode 100644
index fca0aab..0000000
--- a/chrome/browser/views/bookmark_editor_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/bookmark_editor_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BOOKMARK_EDITOR_VIEW_H_
-
diff --git a/chrome/browser/views/bookmark_menu_controller_views.h b/chrome/browser/views/bookmark_menu_controller_views.h
deleted file mode 100644
index 2fcca0c..0000000
--- a/chrome/browser/views/bookmark_menu_controller_views.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
-#define CHROME_BROWSER_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/bookmark_menu_controller_views.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BOOKMARK_MENU_CONTROLLER_VIEWS_H_
-
diff --git a/chrome/browser/views/browser_actions_container.h b/chrome/browser/views/browser_actions_container.h
deleted file mode 100644
index 0b6b094..0000000
--- a/chrome/browser/views/browser_actions_container.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
-#define CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/browser_actions_container.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BROWSER_ACTIONS_CONTAINER_H_
-
diff --git a/chrome/browser/views/browser_bubble.h b/chrome/browser/views/browser_bubble.h
deleted file mode 100644
index cc4352c..0000000
--- a/chrome/browser/views/browser_bubble.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_
-#define CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/browser_bubble.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BROWSER_BUBBLE_H_
-
diff --git a/chrome/browser/views/browser_dialogs.h b/chrome/browser/views/browser_dialogs.h
deleted file mode 100644
index ebff745..0000000
--- a/chrome/browser/views/browser_dialogs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_
-#define CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/browser_dialogs.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BROWSER_DIALOGS_H_
-
diff --git a/chrome/browser/views/bubble_border.h b/chrome/browser/views/bubble_border.h
deleted file mode 100644
index 2d88c30..0000000
--- a/chrome/browser/views/bubble_border.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_BUBBLE_BORDER_H_
-#define CHROME_BROWSER_VIEWS_BUBBLE_BORDER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/bubble_border.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_BUBBLE_BORDER_H_
-
diff --git a/chrome/browser/views/chrome_views_delegate.h b/chrome/browser/views/chrome_views_delegate.h
deleted file mode 100644
index 01144e5..0000000
--- a/chrome/browser/views/chrome_views_delegate.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_
-#define CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/chrome_views_delegate.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CHROME_VIEWS_DELEGATE_H_
-
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
deleted file mode 100644
index e9d8b20..0000000
--- a/chrome/browser/views/clear_browsing_data.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_
-#define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_
-#pragma once
-
-#include "chrome/browser/ui/views/clear_browsing_data.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H_
-
diff --git a/chrome/browser/views/clear_browsing_data_view.h b/chrome/browser/views/clear_browsing_data_view.h
deleted file mode 100644
index 9911fb1..0000000
--- a/chrome/browser/views/clear_browsing_data_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_VIEW_H_
-#define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/clear_browsing_data_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_VIEW_H_
-
diff --git a/chrome/browser/views/clear_data_view.h b/chrome/browser/views/clear_data_view.h
deleted file mode 100644
index f03a941..0000000
--- a/chrome/browser/views/clear_data_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CLEAR_DATA_VIEW_H_
-#define CHROME_BROWSER_VIEWS_CLEAR_DATA_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/clear_data_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CLEAR_DATA_VIEW_H_
-
diff --git a/chrome/browser/views/clear_server_data.h b/chrome/browser/views/clear_server_data.h
deleted file mode 100644
index ecce971..0000000
--- a/chrome/browser/views/clear_server_data.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CLEAR_SERVER_DATA_H_
-#define CHROME_BROWSER_VIEWS_CLEAR_SERVER_DATA_H_
-#pragma once
-
-#include "chrome/browser/ui/views/clear_server_data.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CLEAR_SERVER_DATA_H_
-
diff --git a/chrome/browser/views/collected_cookies_win.h b/chrome/browser/views/collected_cookies_win.h
deleted file mode 100644
index a13b856..0000000
--- a/chrome/browser/views/collected_cookies_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_COLLECTED_COOKIES_WIN_H_
-#define CHROME_BROWSER_VIEWS_COLLECTED_COOKIES_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/collected_cookies_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_COLLECTED_COOKIES_WIN_H_
-
diff --git a/chrome/browser/views/confirm_message_box_dialog.h b/chrome/browser/views/confirm_message_box_dialog.h
deleted file mode 100644
index 26ca059..0000000
--- a/chrome/browser/views/confirm_message_box_dialog.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CONFIRM_MESSAGE_BOX_DIALOG_H_
-#define CHROME_BROWSER_VIEWS_CONFIRM_MESSAGE_BOX_DIALOG_H_
-#pragma once
-
-#include "chrome/browser/ui/views/confirm_message_box_dialog.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CONFIRM_MESSAGE_BOX_DIALOG_H_
-
diff --git a/chrome/browser/views/constrained_window_win.h b/chrome/browser/views/constrained_window_win.h
deleted file mode 100644
index 61ed885..0000000
--- a/chrome/browser/views/constrained_window_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_
-#define CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/constrained_window_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CONSTRAINED_WINDOW_WIN_H_
-
diff --git a/chrome/browser/views/content_setting_bubble_contents.h b/chrome/browser/views/content_setting_bubble_contents.h
deleted file mode 100644
index 03ac993..0000000
--- a/chrome/browser/views/content_setting_bubble_contents.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
-#define CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/content_setting_bubble_contents.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CONTENT_SETTING_BUBBLE_CONTENTS_H_
-
diff --git a/chrome/browser/views/cookie_info_view.h b/chrome/browser/views/cookie_info_view.h
deleted file mode 100644
index 6eb19e5..0000000
--- a/chrome/browser/views/cookie_info_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_COOKIE_INFO_VIEW_H_
-#define CHROME_BROWSER_VIEWS_COOKIE_INFO_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/cookie_info_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_COOKIE_INFO_VIEW_H_
-
diff --git a/chrome/browser/views/create_application_shortcut_view.h b/chrome/browser/views/create_application_shortcut_view.h
deleted file mode 100644
index d117ab2..0000000
--- a/chrome/browser/views/create_application_shortcut_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
-#define CHROME_BROWSER_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/create_application_shortcut_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_CREATE_APPLICATION_SHORTCUT_VIEW_H_
-
diff --git a/chrome/browser/views/database_info_view.h b/chrome/browser/views/database_info_view.h
deleted file mode 100644
index 5f7e747..0000000
--- a/chrome/browser/views/database_info_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_
-#define CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/database_info_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_DATABASE_INFO_VIEW_H_
-
diff --git a/chrome/browser/views/database_open_info_view.h b/chrome/browser/views/database_open_info_view.h
deleted file mode 100644
index be808238..0000000
--- a/chrome/browser/views/database_open_info_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_DATABASE_OPEN_INFO_VIEW_H_
-#define CHROME_BROWSER_VIEWS_DATABASE_OPEN_INFO_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/database_open_info_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_DATABASE_OPEN_INFO_VIEW_H_
-
diff --git a/chrome/browser/views/default_search_view.h b/chrome/browser/views/default_search_view.h
deleted file mode 100644
index 12651c4..0000000
--- a/chrome/browser/views/default_search_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_DEFAULT_SEARCH_VIEW_H_
-#define CHROME_BROWSER_VIEWS_DEFAULT_SEARCH_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/default_search_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_DEFAULT_SEARCH_VIEW_H_
-
diff --git a/chrome/browser/views/detachable_toolbar_view.h b/chrome/browser/views/detachable_toolbar_view.h
deleted file mode 100644
index 68c967b..0000000
--- a/chrome/browser/views/detachable_toolbar_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/detachable_toolbar_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_
-
diff --git a/chrome/browser/views/dom_view.h b/chrome/browser/views/dom_view.h
deleted file mode 100644
index 095fcb7..0000000
--- a/chrome/browser/views/dom_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_DOM_VIEW_H_
-#define CHROME_BROWSER_VIEWS_DOM_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/dom_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_DOM_VIEW_H_
-
diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h
deleted file mode 100644
index cb7dd5c..0000000
--- a/chrome/browser/views/download_item_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_DOWNLOAD_ITEM_VIEW_H_
-#define CHROME_BROWSER_VIEWS_DOWNLOAD_ITEM_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/download_item_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_DOWNLOAD_ITEM_VIEW_H_
-
diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
deleted file mode 100644
index 628abba..0000000
--- a/chrome/browser/views/download_shelf_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_DOWNLOAD_SHELF_VIEW_H_
-#define CHROME_BROWSER_DOWNLOAD_SHELF_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/download_shelf_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_DOWNLOAD_SHELF_VIEW_H_
-
diff --git a/chrome/browser/views/dropdown_bar_host.h b/chrome/browser/views/dropdown_bar_host.h
deleted file mode 100644
index 23c9053..0000000
--- a/chrome/browser/views/dropdown_bar_host.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_DROPDOWN_BAR_HOST_H_
-#define CHROME_BROWSER_VIEWS_DROPDOWN_BAR_HOST_H_
-#pragma once
-
-#include "chrome/browser/ui/views/dropdown_bar_host.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_DROPDOWN_BAR_HOST_H_
-
diff --git a/chrome/browser/views/dropdown_bar_view.h b/chrome/browser/views/dropdown_bar_view.h
deleted file mode 100644
index 9ae52cc..0000000
--- a/chrome/browser/views/dropdown_bar_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_DROPDOWN_BAR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_DROPDOWN_BAR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/dropdown_bar_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_DROPDOWN_BAR_VIEW_H_
-
diff --git a/chrome/browser/views/edit_search_engine_dialog.h b/chrome/browser/views/edit_search_engine_dialog.h
deleted file mode 100644
index f5881ec..0000000
--- a/chrome/browser/views/edit_search_engine_dialog.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_EDIT_SEARCH_ENGINE_DIALOG_H_
-#define CHROME_BROWSER_VIEWS_EDIT_SEARCH_ENGINE_DIALOG_H_
-#pragma once
-
-#include "chrome/browser/ui/views/edit_search_engine_dialog.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_EDIT_SEARCH_ENGINE_DIALOG_H_
-
diff --git a/chrome/browser/views/event_utils.h b/chrome/browser/views/event_utils.h
deleted file mode 100644
index 7d7d370..0000000
--- a/chrome/browser/views/event_utils.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_EVENT_UTILS_H_
-#define CHROME_BROWSER_VIEWS_EVENT_UTILS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/event_utils.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_EVENT_UTILS_H_
-
diff --git a/chrome/browser/views/extensions/browser_action_drag_data.h b/chrome/browser/views/extensions/browser_action_drag_data.h
deleted file mode 100644
index ee3ac8f..0000000
--- a/chrome/browser/views/extensions/browser_action_drag_data.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_DRAG_DATA_H_
-#define CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_DRAG_DATA_H_
-#pragma once
-
-#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_DRAG_DATA_H_
-
diff --git a/chrome/browser/views/extensions/browser_action_overflow_menu_controller.h b/chrome/browser/views/extensions/browser_action_overflow_menu_controller.h
deleted file mode 100644
index 5023765..0000000
--- a/chrome/browser/views/extensions/browser_action_overflow_menu_controller.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
-#define CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/extensions/browser_action_overflow_menu_controller.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_BROWSER_ACTION_OVERFLOW_MENU_CONTROLLER_H_
-
diff --git a/chrome/browser/views/extensions/extension_installed_bubble.h b/chrome/browser/views/extensions/extension_installed_bubble.h
deleted file mode 100644
index ab1c498..0000000
--- a/chrome/browser/views/extensions/extension_installed_bubble.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_
-#define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/extensions/extension_installed_bubble.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_INSTALLED_BUBBLE_H_
-
diff --git a/chrome/browser/views/extensions/extension_popup.h b/chrome/browser/views/extensions/extension_popup.h
deleted file mode 100644
index 6bfa6f6..0000000
--- a/chrome/browser/views/extensions/extension_popup.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_
-#define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_
-#pragma once
-
-#include "chrome/browser/ui/views/extensions/extension_popup.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_POPUP_H_
-
diff --git a/chrome/browser/views/extensions/extension_view.h b/chrome/browser/views/extensions/extension_view.h
deleted file mode 100644
index f7b4e8d..0000000
--- a/chrome/browser/views/extensions/extension_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_
-#define CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/extensions/extension_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_EXTENSIONS_EXTENSION_VIEW_H_
-
diff --git a/chrome/browser/views/external_protocol_dialog.h b/chrome/browser/views/external_protocol_dialog.h
deleted file mode 100644
index 9925dd4..0000000
--- a/chrome/browser/views/external_protocol_dialog.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_EXTERNAL_PROTOCOL_DIALOG_H_
-#define CHROME_BROWSER_VIEWS_EXTERNAL_PROTOCOL_DIALOG_H_
-#pragma once
-
-#include "chrome/browser/ui/views/external_protocol_dialog.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_EXTERNAL_PROTOCOL_DIALOG_H_
-
diff --git a/chrome/browser/views/find_bar_host.h b/chrome/browser/views/find_bar_host.h
deleted file mode 100644
index 4e34679..0000000
--- a/chrome/browser/views/find_bar_host.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_
-#define CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_
-#pragma once
-
-#include "chrome/browser/ui/views/find_bar_host.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FIND_BAR_HOST_H_
-
diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h
deleted file mode 100644
index bb980df..0000000
--- a/chrome/browser/views/find_bar_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FIND_BAR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FIND_BAR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/find_bar_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FIND_BAR_VIEW_H_
-
diff --git a/chrome/browser/views/first_run_bubble.h b/chrome/browser/views/first_run_bubble.h
deleted file mode 100644
index 235e004..0000000
--- a/chrome/browser/views/first_run_bubble.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_
-#define CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/first_run_bubble.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FIRST_RUN_BUBBLE_H_
-
diff --git a/chrome/browser/views/first_run_search_engine_view.h b/chrome/browser/views/first_run_search_engine_view.h
deleted file mode 100644
index 7dffda0..0000000
--- a/chrome/browser/views/first_run_search_engine_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/first_run_search_engine_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_
-
diff --git a/chrome/browser/views/frame/app_panel_browser_frame_view.h b/chrome/browser/views/frame/app_panel_browser_frame_view.h
deleted file mode 100644
index cc93319..0000000
--- a/chrome/browser/views/frame/app_panel_browser_frame_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_APP_PANEL_BROWSER_FRAME_VIEW_H_
-
diff --git a/chrome/browser/views/frame/browser_bubble_host.h b/chrome/browser/views/frame/browser_bubble_host.h
deleted file mode 100644
index f903d99..0000000
--- a/chrome/browser/views/frame/browser_bubble_host.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_BUBBLE_HOST_H_
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_BUBBLE_HOST_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/browser_bubble_host.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_BUBBLE_HOST_H_
-
diff --git a/chrome/browser/views/frame/browser_frame.h b/chrome/browser/views/frame/browser_frame.h
deleted file mode 100644
index eaf9fe6..0000000
--- a/chrome/browser/views/frame/browser_frame.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_H_
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/browser_frame.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_H_
-
diff --git a/chrome/browser/views/frame/browser_frame_gtk.h b/chrome/browser/views/frame/browser_frame_gtk.h
deleted file mode 100644
index 1b8977c..0000000
--- a/chrome/browser/views/frame/browser_frame_gtk.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/browser_frame_gtk.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_GTK_H_
-
diff --git a/chrome/browser/views/frame/browser_frame_win.h b/chrome/browser/views/frame/browser_frame_win.h
deleted file mode 100644
index b755e21..0000000
--- a/chrome/browser/views/frame/browser_frame_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/browser_frame_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
-
diff --git a/chrome/browser/views/frame/browser_non_client_frame_view.h b/chrome/browser/views/frame/browser_non_client_frame_view.h
deleted file mode 100644
index 38b6cfd..0000000
--- a/chrome/browser/views/frame/browser_non_client_frame_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_H_
-
diff --git a/chrome/browser/views/frame/browser_root_view.h b/chrome/browser/views/frame/browser_root_view.h
deleted file mode 100644
index bf129da..0000000
--- a/chrome/browser/views/frame/browser_root_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_ROOT_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_ROOT_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/browser_root_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_ROOT_VIEW_H_
-
diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h
deleted file mode 100644
index 4e90f82..0000000
--- a/chrome/browser/views/frame/browser_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/browser_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_POPUP_BROWSER_VIEW_H_
-
diff --git a/chrome/browser/views/frame/browser_view_layout.h b/chrome/browser/views/frame/browser_view_layout.h
deleted file mode 100644
index a96fa8e..0000000
--- a/chrome/browser/views/frame/browser_view_layout.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
-#define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/browser_view_layout.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
-
diff --git a/chrome/browser/views/frame/contents_container.h b/chrome/browser/views/frame/contents_container.h
deleted file mode 100644
index 07b7983..0000000
--- a/chrome/browser/views/frame/contents_container.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_CONTENTS_CONTAINER_H_
-#define CHROME_BROWSER_VIEWS_FRAME_CONTENTS_CONTAINER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/contents_container.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_CONTENTS_CONTAINER_H_
-
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h
deleted file mode 100644
index 397ef26..0000000
--- a/chrome/browser/views/frame/glass_browser_frame_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_
-
diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h
deleted file mode 100644
index 3e11721..0000000
--- a/chrome/browser/views/frame/opaque_browser_frame_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_H_
-
diff --git a/chrome/browser/views/frame/popup_non_client_frame_view.h b/chrome/browser/views/frame/popup_non_client_frame_view.h
deleted file mode 100644
index 4866d34..0000000
--- a/chrome/browser/views/frame/popup_non_client_frame_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FRAME_POPUP_NON_CLIENT_FRAME_VIEW_H_
-#define CHROME_BROWSER_VIEWS_FRAME_POPUP_NON_CLIENT_FRAME_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FRAME_POPUP_NON_CLIENT_FRAME_VIEW_H_
-
diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h
deleted file mode 100644
index fc71d5c..0000000
--- a/chrome/browser/views/fullscreen_exit_bubble.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H_
-#define CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/fullscreen_exit_bubble.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_FULLSCREEN_EXIT_BUBBLE_H_
-
diff --git a/chrome/browser/views/generic_info_view.h b/chrome/browser/views/generic_info_view.h
deleted file mode 100644
index 014ae18..0000000
--- a/chrome/browser/views/generic_info_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_GENERIC_INFO_VIEW_H_
-#define CHROME_BROWSER_VIEWS_GENERIC_INFO_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/generic_info_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_GENERIC_INFO_VIEW_H_
-
diff --git a/chrome/browser/views/html_dialog_view.h b/chrome/browser/views/html_dialog_view.h
deleted file mode 100644
index c26c76a..0000000
--- a/chrome/browser/views/html_dialog_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_
-#define CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/html_dialog_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_HTML_DIALOG_VIEW_H_
-
diff --git a/chrome/browser/views/importer_lock_view.h b/chrome/browser/views/importer_lock_view.h
deleted file mode 100644
index 1c64d40..0000000
--- a/chrome/browser/views/importer_lock_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_IMPORTER_LOCK_VIEW_H_
-#define CHROME_BROWSER_IMPORTER_LOCK_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/importer_lock_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_IMPORTER_LOCK_VIEW_H_
-
diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h
deleted file mode 100644
index 44afa36..0000000
--- a/chrome/browser/views/importer_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H_
-#define CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/importer_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H_
-
diff --git a/chrome/browser/views/importing_progress_view.h b/chrome/browser/views/importing_progress_view.h
deleted file mode 100644
index 5805c52..0000000
--- a/chrome/browser/views/importing_progress_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_
-#define CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/importing_progress_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_IMPORTING_PROGRESS_VIEW_H_
-
diff --git a/chrome/browser/views/indexed_db_info_view.h b/chrome/browser/views/indexed_db_info_view.h
deleted file mode 100644
index 6f2ccb4..0000000
--- a/chrome/browser/views/indexed_db_info_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INDEXED_DB_INFO_VIEW_H_
-#define CHROME_BROWSER_VIEWS_INDEXED_DB_INFO_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/indexed_db_info_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INDEXED_DB_INFO_VIEW_H_
-
diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h
deleted file mode 100644
index bd7dba6..0000000
--- a/chrome/browser/views/info_bubble.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_
-#define CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/info_bubble.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFO_BUBBLE_H_
-
diff --git a/chrome/browser/views/infobars/after_translate_infobar.h b/chrome/browser/views/infobars/after_translate_infobar.h
deleted file mode 100644
index d0c8fcc..0000000
--- a/chrome/browser/views/infobars/after_translate_infobar.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_AFTER_TRANSLATE_INFOBAR_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_AFTER_TRANSLATE_INFOBAR_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/after_translate_infobar.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_AFTER_TRANSLATE_INFOBAR_H_
-
diff --git a/chrome/browser/views/infobars/before_translate_infobar.h b/chrome/browser/views/infobars/before_translate_infobar.h
deleted file mode 100644
index 1cf685c..0000000
--- a/chrome/browser/views/infobars/before_translate_infobar.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/before_translate_infobar.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_BEFORE_TRANSLATE_INFOBAR_H_
-
diff --git a/chrome/browser/views/infobars/extension_infobar.h b/chrome/browser/views/infobars/extension_infobar.h
deleted file mode 100644
index 0b1ae4a..0000000
--- a/chrome/browser/views/infobars/extension_infobar.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/extension_infobar.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_EXTENSION_INFOBAR_H_
-
diff --git a/chrome/browser/views/infobars/infobar_button_border.h b/chrome/browser/views/infobars/infobar_button_border.h
deleted file mode 100644
index daafb16..0000000
--- a/chrome/browser/views/infobars/infobar_button_border.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_BUTTON_BORDER_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_BUTTON_BORDER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/infobar_button_border.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_BUTTON_BORDER_H_
-
diff --git a/chrome/browser/views/infobars/infobar_container.h b/chrome/browser/views/infobars/infobar_container.h
deleted file mode 100644
index 13c3f56..0000000
--- a/chrome/browser/views/infobars/infobar_container.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/infobar_container.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_CONTAINER_H_
-
diff --git a/chrome/browser/views/infobars/infobar_text_button.h b/chrome/browser/views/infobars/infobar_text_button.h
deleted file mode 100644
index 7255f0d..0000000
--- a/chrome/browser/views/infobars/infobar_text_button.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_TEXT_BUTTON_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_TEXT_BUTTON_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/infobar_text_button.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_INFOBAR_TEXT_BUTTON_H_
-
diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h
deleted file mode 100644
index 9345bdc..0000000
--- a/chrome/browser/views/infobars/infobars.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/infobars.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_INFOBARS_H_
-
diff --git a/chrome/browser/views/infobars/translate_infobar_base.h b/chrome/browser/views/infobars/translate_infobar_base.h
deleted file mode 100644
index 84b68dc..0000000
--- a/chrome/browser/views/infobars/translate_infobar_base.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_INFOBAR_BASE_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_INFOBAR_BASE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/translate_infobar_base.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_INFOBAR_BASE_H_
-
diff --git a/chrome/browser/views/infobars/translate_message_infobar.h b/chrome/browser/views/infobars/translate_message_infobar.h
deleted file mode 100644
index d893fe7..0000000
--- a/chrome/browser/views/infobars/translate_message_infobar.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_MESSAGE_INFOBAR_H_
-#define CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_MESSAGE_INFOBAR_H_
-#pragma once
-
-#include "chrome/browser/ui/views/infobars/translate_message_infobar.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INFOBARS_TRANSLATE_MESSAGE_INFOBAR_H_
-
diff --git a/chrome/browser/views/instant_confirm_view.h b/chrome/browser/views/instant_confirm_view.h
deleted file mode 100644
index d0f87d4..0000000
--- a/chrome/browser/views/instant_confirm_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_INSTANT_CONFIRM_VIEW_H_
-#define CHROME_BROWSER_VIEWS_INSTANT_CONFIRM_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/instant_confirm_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_INSTANT_CONFIRM_VIEW_H_
-
diff --git a/chrome/browser/views/js_modal_dialog_views.h b/chrome/browser/views/js_modal_dialog_views.h
deleted file mode 100644
index a5c6425..0000000
--- a/chrome/browser/views/js_modal_dialog_views.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_JS_MODAL_DIALOG_VIEWS_H_
-#define CHROME_BROWSER_VIEWS_JS_MODAL_DIALOG_VIEWS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/js_modal_dialog_views.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_JS_MODAL_DIALOG_VIEWS_H_
-
diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h
deleted file mode 100644
index a3f5b8f..0000000
--- a/chrome/browser/views/keyword_editor_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/keyword_editor_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_KEYWORD_EDITOR_VIEW_H_
-
diff --git a/chrome/browser/views/list_background.h b/chrome/browser/views/list_background.h
deleted file mode 100644
index 4cf550b..0000000
--- a/chrome/browser/views/list_background.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LIST_BACKGROUND_H_
-#define CHROME_BROWSER_VIEWS_LIST_BACKGROUND_H_
-#pragma once
-
-#include "chrome/browser/ui/views/list_background.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LIST_BACKGROUND_H_
-
diff --git a/chrome/browser/views/local_storage_info_view.h b/chrome/browser/views/local_storage_info_view.h
deleted file mode 100644
index 3550959..0000000
--- a/chrome/browser/views/local_storage_info_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/local_storage_info_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCAL_STORAGE_INFO_VIEW_H_
-
diff --git a/chrome/browser/views/local_storage_set_item_info_view.h b/chrome/browser/views/local_storage_set_item_info_view.h
deleted file mode 100644
index ee16aaa..0000000
--- a/chrome/browser/views/local_storage_set_item_info_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCAL_STORAGE_SET_ITEM_INFO_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCAL_STORAGE_SET_ITEM_INFO_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/local_storage_set_item_info_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCAL_STORAGE_SET_ITEM_INFO_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/click_handler.h b/chrome/browser/views/location_bar/click_handler.h
deleted file mode 100644
index 155e501f..0000000
--- a/chrome/browser/views/location_bar/click_handler.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_CLICK_HANDLER_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_CLICK_HANDLER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/click_handler.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_CLICK_HANDLER_H_
-
diff --git a/chrome/browser/views/location_bar/content_setting_image_view.h b/chrome/browser/views/location_bar/content_setting_image_view.h
deleted file mode 100644
index 1bcb7bf..0000000
--- a/chrome/browser/views/location_bar/content_setting_image_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/content_setting_image_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_CONTENT_SETTING_IMAGE_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/ev_bubble_view.h b/chrome/browser/views/location_bar/ev_bubble_view.h
deleted file mode 100644
index 1070a6b..0000000
--- a/chrome/browser/views/location_bar/ev_bubble_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_EV_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_EV_BUBBLE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/ev_bubble_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_EV_BUBBLE_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/icon_label_bubble_view.h b/chrome/browser/views/location_bar/icon_label_bubble_view.h
deleted file mode 100644
index 9e3dde6..0000000
--- a/chrome/browser/views/location_bar/icon_label_bubble_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/icon_label_bubble_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_ICON_LABEL_BUBBLE_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/keyword_hint_view.h b/chrome/browser/views/location_bar/keyword_hint_view.h
deleted file mode 100644
index defea0e..0000000
--- a/chrome/browser/views/location_bar/keyword_hint_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_KEYWORD_HINT_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_KEYWORD_HINT_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_KEYWORD_HINT_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/location_bar_view.h b/chrome/browser/views/location_bar/location_bar_view.h
deleted file mode 100644
index 1e2b2d7..0000000
--- a/chrome/browser/views/location_bar/location_bar_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/location_icon_view.h b/chrome/browser/views/location_bar/location_icon_view.h
deleted file mode 100644
index d0de238..0000000
--- a/chrome/browser/views/location_bar/location_icon_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/location_icon_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_LOCATION_ICON_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/page_action_image_view.h b/chrome/browser/views/location_bar/page_action_image_view.h
deleted file mode 100644
index aa01f4d..0000000
--- a/chrome/browser/views/location_bar/page_action_image_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_IMAGE_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/page_action_with_badge_view.h b/chrome/browser/views/location_bar/page_action_with_badge_view.h
deleted file mode 100644
index 4bdc71e..0000000
--- a/chrome/browser/views/location_bar/page_action_with_badge_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_PAGE_ACTION_WITH_BADGE_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/selected_keyword_view.h b/chrome/browser/views/location_bar/selected_keyword_view.h
deleted file mode 100644
index bce29d0..0000000
--- a/chrome/browser/views/location_bar/selected_keyword_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_SELECTED_KEYWORD_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_SELECTED_KEYWORD_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_SELECTED_KEYWORD_VIEW_H_
-
diff --git a/chrome/browser/views/location_bar/star_view.h b/chrome/browser/views/location_bar/star_view.h
deleted file mode 100644
index a964d14..0000000
--- a/chrome/browser/views/location_bar/star_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_STAR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOCATION_BAR_STAR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/location_bar/star_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOCATION_BAR_STAR_VIEW_H_
-
diff --git a/chrome/browser/views/login_view.h b/chrome/browser/views/login_view.h
deleted file mode 100644
index bb45e10..0000000
--- a/chrome/browser/views/login_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_LOGIN_VIEW_H_
-#define CHROME_BROWSER_VIEWS_LOGIN_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/login_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_LOGIN_VIEW_H_
-
diff --git a/chrome/browser/views/modal_dialog_delegate.h b/chrome/browser/views/modal_dialog_delegate.h
deleted file mode 100644
index 06cba14..0000000
--- a/chrome/browser/views/modal_dialog_delegate.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_MODAL_DIALOG_DELEGATE_H_
-#define CHROME_BROWSER_VIEWS_MODAL_DIALOG_DELEGATE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/modal_dialog_delegate.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_MODAL_DIALOG_DELEGATE_H_
-
diff --git a/chrome/browser/views/notifications/balloon_view.h b/chrome/browser/views/notifications/balloon_view.h
deleted file mode 100644
index 2896feb..0000000
--- a/chrome/browser/views/notifications/balloon_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_
-#define CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/notifications/balloon_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_H_
-
diff --git a/chrome/browser/views/notifications/balloon_view_host.h b/chrome/browser/views/notifications/balloon_view_host.h
deleted file mode 100644
index 2c1a302..0000000
--- a/chrome/browser/views/notifications/balloon_view_host.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_
-#define CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_
-#pragma once
-
-#include "chrome/browser/ui/views/notifications/balloon_view_host.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_NOTIFICATIONS_BALLOON_VIEW_HOST_H_
-
diff --git a/chrome/browser/views/options/advanced_contents_view.h b/chrome/browser/views/options/advanced_contents_view.h
deleted file mode 100644
index 9026e82..0000000
--- a/chrome/browser/views/options/advanced_contents_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/advanced_contents_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_CONTENTS_VIEW_H_
-
diff --git a/chrome/browser/views/options/advanced_page_view.h b/chrome/browser/views/options/advanced_page_view.h
deleted file mode 100644
index dccd66e..0000000
--- a/chrome/browser/views/options/advanced_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/advanced_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/content_exceptions_table_view.h b/chrome/browser/views/options/content_exceptions_table_view.h
deleted file mode 100644
index 6cc48fb..0000000
--- a/chrome/browser/views/options/content_exceptions_table_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_EXCEPTIONS_TABLE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_EXCEPTIONS_TABLE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/content_exceptions_table_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_EXCEPTIONS_TABLE_VIEW_H_
-
diff --git a/chrome/browser/views/options/content_filter_page_view.h b/chrome/browser/views/options/content_filter_page_view.h
deleted file mode 100644
index 0a1115e..0000000
--- a/chrome/browser/views/options/content_filter_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_FILTER_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_FILTER_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/content_filter_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_FILTER_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h
deleted file mode 100644
index 1335775..0000000
--- a/chrome/browser/views/options/content_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/content_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/content_settings_window_view.h b/chrome/browser/views/options/content_settings_window_view.h
deleted file mode 100644
index a3bc919..0000000
--- a/chrome/browser/views/options/content_settings_window_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/content_settings_window_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_CONTENT_SETTINGS_WINDOW_VIEW_H_
-
diff --git a/chrome/browser/views/options/cookie_filter_page_view.h b/chrome/browser/views/options/cookie_filter_page_view.h
deleted file mode 100644
index 3168e0e..0000000
--- a/chrome/browser/views/options/cookie_filter_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_COOKIE_FILTER_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_COOKIE_FILTER_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/cookie_filter_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_COOKIE_FILTER_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h
deleted file mode 100644
index dd74019..0000000
--- a/chrome/browser/views/options/cookies_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/cookies_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H_
-
diff --git a/chrome/browser/views/options/exception_editor_view.h b/chrome/browser/views/options/exception_editor_view.h
deleted file mode 100644
index fb63617..0000000
--- a/chrome/browser/views/options/exception_editor_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/exception_editor_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTION_EDITOR_VIEW_H_
-
diff --git a/chrome/browser/views/options/exceptions_page_view.h b/chrome/browser/views/options/exceptions_page_view.h
deleted file mode 100644
index c9eab58..0000000
--- a/chrome/browser/views/options/exceptions_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/exceptions_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/exceptions_view.h b/chrome/browser/views/options/exceptions_view.h
deleted file mode 100644
index 6ff6f02..0000000
--- a/chrome/browser/views/options/exceptions_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/exceptions_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_EXCEPTIONS_VIEW_H_
-
diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h
deleted file mode 100644
index 1702d9a..0000000
--- a/chrome/browser/views/options/fonts_languages_window_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_LANGUAGES_WINDOW_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_LANGUAGES_WINDOW_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/fonts_languages_window_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_FONTS_LANGUAGES_WINDOW_VIEW_H_
-
diff --git a/chrome/browser/views/options/fonts_page_view.h b/chrome/browser/views/options/fonts_page_view.h
deleted file mode 100644
index 22cad00..0000000
--- a/chrome/browser/views/options/fonts_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/fonts_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_FONTS_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h
deleted file mode 100644
index f9072e1..0000000
--- a/chrome/browser/views/options/general_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/general_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_GENERAL_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h
deleted file mode 100644
index 722a893..0000000
--- a/chrome/browser/views/options/languages_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGES_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGES_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/languages_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGES_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/managed_prefs_banner_view.h b/chrome/browser/views/options/managed_prefs_banner_view.h
deleted file mode 100644
index d1efb86..0000000
--- a/chrome/browser/views/options/managed_prefs_banner_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_MANAGED_PREFS_BANNER_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_MANAGED_PREFS_BANNER_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/managed_prefs_banner_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_MANAGED_PREFS_BANNER_VIEW_H_
-
diff --git a/chrome/browser/views/options/options_group_view.h b/chrome/browser/views/options/options_group_view.h
deleted file mode 100644
index b3bf71b..0000000
--- a/chrome/browser/views/options/options_group_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/options_group_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_GROUP_VIEW_H_
-
diff --git a/chrome/browser/views/options/options_page_view.h b/chrome/browser/views/options/options_page_view.h
deleted file mode 100644
index 2920edb..0000000
--- a/chrome/browser/views/options/options_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/options_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/passwords_exceptions_window_view.h b/chrome/browser/views/options/passwords_exceptions_window_view.h
deleted file mode 100644
index 7adbd5f..0000000
--- a/chrome/browser/views/options/passwords_exceptions_window_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/passwords_exceptions_window_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_EXCEPTIONS_WINDOW_VIEW_H_
-
diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h
deleted file mode 100644
index 2c4612a..0000000
--- a/chrome/browser/views/options/passwords_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/passwords_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_PASSWORDS_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/plugin_filter_page_view.h b/chrome/browser/views/options/plugin_filter_page_view.h
deleted file mode 100644
index d1d4086..0000000
--- a/chrome/browser/views/options/plugin_filter_page_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_PLUGIN_FILTER_PAGE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_PLUGIN_FILTER_PAGE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/plugin_filter_page_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_PLUGIN_FILTER_PAGE_VIEW_H_
-
diff --git a/chrome/browser/views/options/simple_content_exceptions_view.h b/chrome/browser/views/options/simple_content_exceptions_view.h
deleted file mode 100644
index 6b89cd9..0000000
--- a/chrome/browser/views/options/simple_content_exceptions_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_VIEW_H_
-#define CHROME_BROWSER_VIEWS_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/options/simple_content_exceptions_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_OPTIONS_SIMPLE_CONTENT_EXCEPTIONS_VIEW_H_
-
diff --git a/chrome/browser/views/page_info_bubble_view.h b/chrome/browser/views/page_info_bubble_view.h
deleted file mode 100644
index cb920bb..0000000
--- a/chrome/browser/views/page_info_bubble_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/page_info_bubble_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_PAGE_INFO_BUBBLE_VIEW_H_
-
diff --git a/chrome/browser/views/pinned_contents_info_bubble.h b/chrome/browser/views/pinned_contents_info_bubble.h
deleted file mode 100644
index a2af973..0000000
--- a/chrome/browser/views/pinned_contents_info_bubble.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_PINNED_CONTENTS_INFO_BUBBLE_H_
-#define CHROME_BROWSER_VIEWS_PINNED_CONTENTS_INFO_BUBBLE_H_
-#pragma once
-
-#include "chrome/browser/ui/views/pinned_contents_info_bubble.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_PINNED_CONTENTS_INFO_BUBBLE_H_
-
diff --git a/chrome/browser/views/reload_button.h b/chrome/browser/views/reload_button.h
deleted file mode 100644
index 71118e1..0000000
--- a/chrome/browser/views/reload_button.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_RELOAD_BUTTON_H_
-#define CHROME_BROWSER_VIEWS_RELOAD_BUTTON_H_
-#pragma once
-
-#include "chrome/browser/ui/views/reload_button.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_RELOAD_BUTTON_H_
-
diff --git a/chrome/browser/views/repost_form_warning_view.h b/chrome/browser/views/repost_form_warning_view.h
deleted file mode 100644
index 1dd6888..0000000
--- a/chrome/browser/views/repost_form_warning_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_
-#define CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/repost_form_warning_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_REPOST_FORM_WARNING_VIEW_H_
-
diff --git a/chrome/browser/views/restart_message_box.h b/chrome/browser/views/restart_message_box.h
deleted file mode 100644
index 1547e92..0000000
--- a/chrome/browser/views/restart_message_box.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_
-#define CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_
-#pragma once
-
-#include "chrome/browser/ui/views/restart_message_box.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_RESTART_MESSAGE_BOX_H_
-
diff --git a/chrome/browser/views/sad_tab_view.h b/chrome/browser/views/sad_tab_view.h
deleted file mode 100644
index f21d8e8..0000000
--- a/chrome/browser/views/sad_tab_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_SAD_TAB_VIEW_H_
-#define CHROME_BROWSER_VIEWS_SAD_TAB_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/sad_tab_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_SAD_TAB_VIEW_H_
-
diff --git a/chrome/browser/views/status_bubble_views.h b/chrome/browser/views/status_bubble_views.h
deleted file mode 100644
index 3d10bd4..0000000
--- a/chrome/browser/views/status_bubble_views.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_
-#define CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/status_bubble_views.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_STATUS_BUBBLE_VIEWS_H_
-
diff --git a/chrome/browser/views/status_icons/status_icon_win.h b/chrome/browser/views/status_icons/status_icon_win.h
deleted file mode 100644
index 1f7ce62..0000000
--- a/chrome/browser/views/status_icons/status_icon_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
-#define CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/status_icons/status_icon_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_ICON_WIN_H_
-
diff --git a/chrome/browser/views/status_icons/status_tray_win.h b/chrome/browser/views/status_icons/status_tray_win.h
deleted file mode 100644
index 7d7f301..0000000
--- a/chrome/browser/views/status_icons/status_tray_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_
-#define CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/status_icons/status_tray_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_STATUS_ICONS_STATUS_TRAY_WIN_H_
-
diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container.h b/chrome/browser/views/tab_contents/native_tab_contents_container.h
deleted file mode 100644
index 7f2cdfc..0000000
--- a/chrome/browser/views/tab_contents/native_tab_contents_container.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_H_
-
diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h b/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h
deleted file mode 100644
index cab3c2b..0000000
--- a/chrome/browser/views/tab_contents/native_tab_contents_container_gtk.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_GTK_H_
-
diff --git a/chrome/browser/views/tab_contents/native_tab_contents_container_win.h b/chrome/browser/views/tab_contents/native_tab_contents_container_win.h
deleted file mode 100644
index 5418181..0000000
--- a/chrome/browser/views/tab_contents/native_tab_contents_container_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_WIN_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_NATIVE_TAB_CONTENTS_CONTAINER_WIN_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
deleted file mode 100644
index 98e610d..0000000
--- a/chrome/browser/views/tab_contents/render_view_context_menu_views.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/render_view_context_menu_views.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_RENDER_VIEW_CONTEXT_MENU_VIEWS_H_
-
diff --git a/chrome/browser/views/tab_contents/tab_contents_container.h b/chrome/browser/views/tab_contents/tab_contents_container.h
deleted file mode 100644
index 9039060..0000000
--- a/chrome/browser/views/tab_contents/tab_contents_container.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_CONTAINER_H_
-
diff --git a/chrome/browser/views/tab_contents/tab_contents_drag_win.h b/chrome/browser/views/tab_contents/tab_contents_drag_win.h
deleted file mode 100644
index 79067eb..0000000
--- a/chrome/browser/views/tab_contents/tab_contents_drag_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_DRAG_WIN_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_DRAG_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/tab_contents_drag_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_DRAG_WIN_H_
-
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_gtk.h b/chrome/browser/views/tab_contents/tab_contents_view_gtk.h
deleted file mode 100644
index 3ee3e9a..0000000
--- a/chrome/browser/views/tab_contents/tab_contents_view_gtk.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/tab_contents_view_gtk.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_GTK_H_
-
diff --git a/chrome/browser/views/tab_contents/tab_contents_view_win.h b/chrome/browser/views/tab_contents/tab_contents_view_win.h
deleted file mode 100644
index 49f6a13..0000000
--- a/chrome/browser/views/tab_contents/tab_contents_view_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
-#define CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_contents/tab_contents_view_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_CONTENTS_TAB_CONTENTS_VIEW_WIN_H_
-
diff --git a/chrome/browser/views/tab_icon_view.h b/chrome/browser/views/tab_icon_view.h
deleted file mode 100644
index 064c8a7..0000000
--- a/chrome/browser/views/tab_icon_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_
-#define CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tab_icon_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TAB_ICON_VIEW_H_
-
diff --git a/chrome/browser/views/tabs/base_tab.h b/chrome/browser/views/tabs/base_tab.h
deleted file mode 100644
index e826fbf..0000000
--- a/chrome/browser/views/tabs/base_tab.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_
-#define CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/base_tab.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_BASE_TAB_H_
-
diff --git a/chrome/browser/views/tabs/base_tab_strip.h b/chrome/browser/views/tabs/base_tab_strip.h
deleted file mode 100644
index 603dcf9..0000000
--- a/chrome/browser/views/tabs/base_tab_strip.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_BASE_TAB_STRIP_H_
-#define CHROME_BROWSER_VIEWS_TABS_BASE_TAB_STRIP_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/base_tab_strip.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_BASE_TAB_STRIP_H_
-
diff --git a/chrome/browser/views/tabs/browser_tab_strip_controller.h b/chrome/browser/views/tabs/browser_tab_strip_controller.h
deleted file mode 100644
index 6606f28..0000000
--- a/chrome/browser/views/tabs/browser_tab_strip_controller.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
-#define CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_
-
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.h b/chrome/browser/views/tabs/dragged_tab_controller.h
deleted file mode 100644
index e445018..0000000
--- a/chrome/browser/views/tabs/dragged_tab_controller.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
-#define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/dragged_tab_controller.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_CONTROLLER_H_
-
diff --git a/chrome/browser/views/tabs/dragged_tab_view.h b/chrome/browser/views/tabs/dragged_tab_view.h
deleted file mode 100644
index 2848baf..0000000
--- a/chrome/browser/views/tabs/dragged_tab_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_
-#define CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/dragged_tab_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_DRAGGED_TAB_VIEW_H_
-
diff --git a/chrome/browser/views/tabs/native_view_photobooth.h b/chrome/browser/views/tabs/native_view_photobooth.h
deleted file mode 100644
index 1a954e5..0000000
--- a/chrome/browser/views/tabs/native_view_photobooth.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_
-#define CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/native_view_photobooth.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_
-
diff --git a/chrome/browser/views/tabs/native_view_photobooth_gtk.h b/chrome/browser/views/tabs/native_view_photobooth_gtk.h
deleted file mode 100644
index 22c3901..0000000
--- a/chrome/browser/views/tabs/native_view_photobooth_gtk.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_
-#define CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/native_view_photobooth_gtk.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_
-
diff --git a/chrome/browser/views/tabs/native_view_photobooth_win.h b/chrome/browser/views/tabs/native_view_photobooth_win.h
deleted file mode 100644
index 2cd2a4b..0000000
--- a/chrome/browser/views/tabs/native_view_photobooth_win.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_
-#define CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/native_view_photobooth_win.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_
-
diff --git a/chrome/browser/views/tabs/side_tab.h b/chrome/browser/views/tabs/side_tab.h
deleted file mode 100644
index 5d27ce3..0000000
--- a/chrome/browser/views/tabs/side_tab.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_
-#define CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/side_tab.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_H_
-
diff --git a/chrome/browser/views/tabs/side_tab_strip.h b/chrome/browser/views/tabs/side_tab_strip.h
deleted file mode 100644
index cbecf20..0000000
--- a/chrome/browser/views/tabs/side_tab_strip.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_STRIP_H_
-#define CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_STRIP_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/side_tab_strip.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_SIDE_TAB_STRIP_H_
-
diff --git a/chrome/browser/views/tabs/tab.h b/chrome/browser/views/tabs/tab.h
deleted file mode 100644
index 11076c1..0000000
--- a/chrome/browser/views/tabs/tab.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_H_
-#define CHROME_BROWSER_VIEWS_TABS_TAB_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/tab.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_TAB_H_
-
diff --git a/chrome/browser/views/tabs/tab_controller.h b/chrome/browser/views/tabs/tab_controller.h
deleted file mode 100644
index 5205f5e..0000000
--- a/chrome/browser/views/tabs/tab_controller.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_CONTROLLER_H_
-#define CHROME_BROWSER_VIEWS_TABS_TAB_CONTROLLER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/tab_controller.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_TAB_CONTROLLER_H_
-
diff --git a/chrome/browser/views/tabs/tab_renderer_data.h b/chrome/browser/views/tabs/tab_renderer_data.h
deleted file mode 100644
index dca47c9..0000000
--- a/chrome/browser/views/tabs/tab_renderer_data.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_DATA_H_
-#define CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_DATA_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_TAB_RENDERER_DATA_H_
-
diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h
deleted file mode 100644
index 4c24f8c..0000000
--- a/chrome/browser/views/tabs/tab_strip.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
-#define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/tab_strip.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
-
diff --git a/chrome/browser/views/tabs/tab_strip_controller.h b/chrome/browser/views/tabs/tab_strip_controller.h
deleted file mode 100644
index b0c7be9..0000000
--- a/chrome/browser/views/tabs/tab_strip_controller.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_
-#define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/tabs/tab_strip_controller.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_CONTROLLER_H_
-
diff --git a/chrome/browser/views/textfield_views.h b/chrome/browser/views/textfield_views.h
deleted file mode 100644
index 3b699f0..0000000
--- a/chrome/browser/views/textfield_views.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TEXTFIELD_VIEWS_H_
-#define CHROME_BROWSER_VIEWS_TEXTFIELD_VIEWS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/textfield_views.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TEXTFIELD_VIEWS_H_
-
diff --git a/chrome/browser/views/theme_background.h b/chrome/browser/views/theme_background.h
deleted file mode 100644
index 98ce8f6..0000000
--- a/chrome/browser/views/theme_background.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_THEME_BACKGROUND_H_
-#define CHROME_BROWSER_VIEWS_THEME_BACKGROUND_H_
-#pragma once
-
-#include "chrome/browser/ui/views/theme_background.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_THEME_BACKGROUND_H_
-
diff --git a/chrome/browser/views/theme_helpers.h b/chrome/browser/views/theme_helpers.h
deleted file mode 100644
index b7bd4f2..0000000
--- a/chrome/browser/views/theme_helpers.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_THEME_HELPERS_H_
-#define CHROME_BROWSER_VIEWS_THEME_HELPERS_H_
-#pragma once
-
-#include "chrome/browser/ui/views/theme_helpers.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_THEME_HELPERS_H_
-
diff --git a/chrome/browser/views/theme_install_bubble_view.h b/chrome/browser/views/theme_install_bubble_view.h
deleted file mode 100644
index b0eddec..0000000
--- a/chrome/browser/views/theme_install_bubble_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_THEME_INSTALL_BUBBLE_VIEW_H_
-#define CHROME_BROWSER_VIEWS_THEME_INSTALL_BUBBLE_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/theme_install_bubble_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_THEME_INSTALL_BUBBLE_VIEW_H_
-
diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h
deleted file mode 100644
index 647f721..0000000
--- a/chrome/browser/views/toolbar_view.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
-#define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
-#pragma once
-
- #include "chrome/browser/ui/views/toolbar_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_
diff --git a/chrome/browser/views/unhandled_keyboard_event_handler.h b/chrome/browser/views/unhandled_keyboard_event_handler.h
deleted file mode 100644
index a007663..0000000
--- a/chrome/browser/views/unhandled_keyboard_event_handler.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_
-#define CHROME_BROWSER_VIEWS_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/unhandled_keyboard_event_handler.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_UNHANDLED_KEYBOARD_EVENT_HANDLER_H_
-
diff --git a/chrome/browser/views/uninstall_view.h b/chrome/browser/views/uninstall_view.h
deleted file mode 100644
index e366791..0000000
--- a/chrome/browser/views/uninstall_view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_UNINSTALL_VIEW_H_
-#define CHROME_BROWSER_VIEWS_UNINSTALL_VIEW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/uninstall_view.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_UNINSTALL_VIEW_H_
-
diff --git a/chrome/browser/views/update_recommended_message_box.h b/chrome/browser/views/update_recommended_message_box.h
deleted file mode 100644
index a5f589e..0000000
--- a/chrome/browser/views/update_recommended_message_box.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_UPDATE_RECOMMENDED_MESSAGE_BOX_H_
-#define CHROME_BROWSER_UPDATE_RECOMMENDED_MESSAGE_BOX_H_
-#pragma once
-
-#include "chrome/browser/ui/views/update_recommended_message_box.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_UPDATE_RECOMMENDED_MESSAGE_BOX_H_
-
diff --git a/chrome/browser/views/url_picker.h b/chrome/browser/views/url_picker.h
deleted file mode 100644
index c716ec5..0000000
--- a/chrome/browser/views/url_picker.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_URL_PICKER_H_
-#define CHROME_BROWSER_VIEWS_URL_PICKER_H_
-#pragma once
-
-#include "chrome/browser/ui/views/url_picker.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_URL_PICKER_H_
-
diff --git a/chrome/browser/views/user_data_dir_dialog.h b/chrome/browser/views/user_data_dir_dialog.h
deleted file mode 100644
index 3ca925d..0000000
--- a/chrome/browser/views/user_data_dir_dialog.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_
-#define CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_
-#pragma once
-
-#include "chrome/browser/ui/views/user_data_dir_dialog.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_USER_DATA_DIR_DIALOG_H_
-
diff --git a/chrome/browser/views/window.h b/chrome/browser/views/window.h
deleted file mode 100644
index 9733676..0000000
--- a/chrome/browser/views/window.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_WINDOW_H_
-#define CHROME_BROWSER_VIEWS_WINDOW_H_
-#pragma once
-
-#include "chrome/browser/ui/views/window.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_WINDOW_H_
-
diff --git a/chrome/browser/views/wrench_menu.h b/chrome/browser/views/wrench_menu.h
deleted file mode 100644
index 1a2c52b..0000000
--- a/chrome/browser/views/wrench_menu.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_VIEWS_WRENCH_MENU_H_
-#define CHROME_BROWSER_VIEWS_WRENCH_MENU_H_
-#pragma once
-
-#include "chrome/browser/ui/views/wrench_menu.h"
-// TODO(beng): remove this file once all includes have been updated.
-
-#endif // CHROME_BROWSER_VIEWS_WRENCH_MENU_H_
-