Move color_utils, text_elider, drag_utils, accessibility_types, standard_layout to new locations in app/ and views/

http://crbug.com/11387
Review URL: http://codereview.chromium.org/113143

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15687 0039d316-1c4b-4281-b951-d872f2087c98

41 files changed, 46 insertions, 126 deletions

diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index faa8744..cc4e294 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -7,6 +7,7 @@
 #include <commdlg.h>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
@@ -14,10 +15,8 @@
 #include "base/win_util.h"
 #include "base/word_iterator.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/common/gfx/color_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/restart_message_box.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/install_util.h"
 #include "grit/chromium_strings.h"
@@ -26,6 +25,7 @@
 #include "grit/theme_resources.h"
 #include "views/controls/text_field.h"
 #include "views/controls/throbber.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 #include "webkit/glue/webkit_glue.h"
 
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 9d11334..27987b1 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -20,7 +20,6 @@
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/plugin_messages.h"
@@ -31,6 +30,7 @@
 #include "views/grid_layout.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/hwnd_view.h"
+#include "views/standard_layout.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc
index aced9e3..74235ba 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -7,13 +7,13 @@
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_tracker.h"
 #include "views/grid_layout.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/text_field.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 namespace {
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
index a6c9366..2dddc6f 100644
--- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
+++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc
@@ -7,6 +7,7 @@
 #include <dwmapi.h>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/color_utils.h"
 #include "app/gfx/insets.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
@@ -14,7 +15,6 @@
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h"
-#include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/win_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc
index d54e5ff..5604db7 100644
--- a/chrome/browser/views/bookmark_bar_view.cc
+++ b/chrome/browser/views/bookmark_bar_view.cc
@@ -7,6 +7,7 @@
 #include <limits>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
@@ -15,7 +16,6 @@
 #include "chrome/browser/bookmarks/bookmark_context_menu.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
-#include "chrome/browser/drag_utils.h"
 #include "chrome/browser/extensions/extension.h"
 #include "chrome/browser/extensions/extension_view.h"
 #include "chrome/browser/extensions/extensions_service.h"
@@ -27,7 +27,6 @@
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/view_ids.h"
 #include "chrome/browser/views/event_utils.h"
-#include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/pref_names.h"
@@ -38,6 +37,7 @@
 #include "skia/ext/skia_utils.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/chrome_menu.h"
+#include "views/drag_utils.h"
 #include "views/view_constants.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/widget/widget.h"
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index abae95f..e24665c 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -14,10 +14,10 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/info_bubble.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
+#include "views/standard_layout.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/text_field.h"
 
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 40472cb..692f72d 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/net/url_fixer_upper.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "googleurl/src/gurl.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -22,6 +21,7 @@
 #include "views/grid_layout.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
+#include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index ec28029..41df839 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/color_utils.h"
 #include "base/thread.h"
 #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
@@ -21,8 +22,6 @@
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/browser/views/bookmark_folder_tree_view.h"
 #include "chrome/browser/views/bookmark_table_view.h"
-#include "chrome/browser/views/standard_layout.h"
-#include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
@@ -33,6 +32,7 @@
 #include "views/controls/button/menu_button.h"
 #include "views/controls/label.h"
 #include "views/controls/single_split_view.h"
+#include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/views/browser_views.vcproj b/chrome/browser/views/browser_views.vcproj
index 1fc5c21..3a79320 100644
--- a/chrome/browser/views/browser_views.vcproj
+++ b/chrome/browser/views/browser_views.vcproj
@@ -786,10 +786,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\standard_layout.h"
-			>
-		</File>
-		<File
 			RelativePath=".\star_toggle.cc"
 			>
 		</File>
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index 7bebdc5..3af66f4 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
@@ -26,6 +25,7 @@
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/window/client_view.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index 6502cd4..1b4f517 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -7,7 +7,6 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
@@ -17,6 +16,7 @@
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 using base::Time;
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 142a983..ca4f35c 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -7,6 +7,7 @@
 #include "app/gfx/chrome_canvas.h"
 #include "app/gfx/chrome_font.h"
 #include "app/gfx/path.h"
+#include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
@@ -20,7 +21,6 @@
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/browser/window_sizer.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc
index 4f1d349..aa74f2fa1 100644
--- a/chrome/browser/views/download_item_view.cc
+++ b/chrome/browser/views/download_item_view.cc
@@ -7,6 +7,7 @@
 #include <vector>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_path.h"
@@ -15,7 +16,6 @@
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/views/download_shelf_view.h"
-#include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/win_util.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc
index c18e94f..2774379 100644
--- a/chrome/browser/views/edit_keyword_controller.cc
+++ b/chrome/browser/views/edit_keyword_controller.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/keyword_editor_view.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -21,6 +20,7 @@
 #include "views/controls/image_view.h"
 #include "views/controls/table/table_view.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 using views::GridLayout;
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index 61bcdb2..552bb44 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -21,6 +20,7 @@
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/focus/focus_manager.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 namespace {
diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc
index 1ac1eb7..7a378ef 100644
--- a/chrome/browser/views/first_run_customize_view.cc
+++ b/chrome/browser/views/first_run_customize_view.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/importer/importer.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/user_metrics.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -19,6 +18,7 @@
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile,
diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index 866b114..bd172f1 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -10,7 +10,6 @@
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/views/first_run_customize_view.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -20,6 +19,7 @@
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/controls/separator.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 namespace {
diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc
index 5a3788a..afb73f0 100644
--- a/chrome/browser/views/first_run_view_base.cc
+++ b/chrome/browser/views/first_run_view_base.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/shell_integration.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ -27,6 +26,7 @@
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
 #include "views/controls/separator.h"
+#include "views/standard_layout.h"
 #include "views/window/client_view.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index ae0ac20..20c7e06 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -9,7 +9,6 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
@@ -22,6 +21,7 @@
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/table/group_table_view.h"
+#include "views/standard_layout.h"
 #include "views/window/client_view.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc
index e2fc249..3d58b33 100644
--- a/chrome/browser/views/importer_lock_view.cc
+++ b/chrome/browser/views/importer_lock_view.cc
@@ -6,11 +6,11 @@
 
 #include "app/l10n_util.h"
 #include "chrome/browser/importer/importer.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/label.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 using views::ColumnSet;
diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc
index 7f03c3b..4bee708 100644
--- a/chrome/browser/views/importer_view.cc
+++ b/chrome/browser/views/importer_view.cc
@@ -6,12 +6,12 @@
 
 #include "app/l10n_util.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 using views::ColumnSet;
diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc
index 2c917d2..8ed9bf8 100644
--- a/chrome/browser/views/importing_progress_view.cc
+++ b/chrome/browser/views/importing_progress_view.cc
@@ -5,13 +5,13 @@
 #include "chrome/browser/views/importing_progress_view.h"
 
 #include "app/l10n_util.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
+#include "views/standard_layout.h"
 #include "views/window/window.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc
index bfb90dc..4dd4296 100644
--- a/chrome/browser/views/keyword_editor_view.cc
+++ b/chrome/browser/views/keyword_editor_view.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/views/edit_keyword_controller.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "googleurl/src/gurl.h"
@@ -29,6 +28,7 @@
 #include "views/grid_layout.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/text_field.h"
+#include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc
index 150e447..cab7ba2 100644
--- a/chrome/browser/views/login_view.cc
+++ b/chrome/browser/views/login_view.cc
@@ -8,11 +8,11 @@
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/text_field.h"
+#include "views/standard_layout.h"
 #include "views/widget/root_view.h"
 
 namespace views {
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc
index aed2aea..3bbf9a6 100644
--- a/chrome/browser/views/options/advanced_contents_view.cc
+++ b/chrome/browser/views/options/advanced_contents_view.cc
@@ -28,7 +28,6 @@
 #include "chrome/browser/views/options/cookies_view.h"
 #include "chrome/browser/views/options/language_combobox_model.h"
 #include "chrome/browser/views/restart_message_box.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/filter_policy.h"
 #include "chrome/common/pref_member.h"
 #include "chrome/common/pref_names.h"
@@ -43,6 +42,7 @@
 #include "views/controls/combo_box.h"
 #include "views/controls/scroll_view.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/widget/widget.h"
 
 using views::GridLayout;
diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc
index ac0fed1..c20ecad 100644
--- a/chrome/browser/views/options/advanced_page_view.cc
+++ b/chrome/browser/views/options/advanced_page_view.cc
@@ -10,7 +10,6 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/views/options/advanced_contents_view.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
@@ -21,6 +20,7 @@
 #include "views/controls/button/native_button.h"
 #include "views/controls/scroll_view.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/window/dialog_delegate.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc
index 955ea3e..6e3aff2 100644
--- a/chrome/browser/views/options/content_page_view.cc
+++ b/chrome/browser/views/options/content_page_view.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/views/options/fonts_languages_window_view.h"
 #include "chrome/browser/views/options/options_group_view.h"
 #include "chrome/browser/views/options/passwords_exceptions_window_view.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
@@ -29,6 +28,7 @@
 #include "views/controls/button/radio_button.h"
 #include "views/controls/text_field.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/widget/widget.h"
 
 namespace {
diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc
index 012e6ab..2b5ab0f 100644
--- a/chrome/browser/views/options/cookies_view.cc
+++ b/chrome/browser/views/options/cookies_view.cc
@@ -7,13 +7,12 @@
 #include "chrome/browser/views/options/cookies_view.h"
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
 #include "base/time_format.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/views/standard_layout.h"
-#include "chrome/common/gfx/color_utils.h"
 #include "chrome/common/win_util.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -26,6 +25,7 @@
 #include "views/controls/button/native_button.h"
 #include "views/controls/text_field.h"
 #include "views/controls/table/table_view.h"
+#include "views/standard_layout.h"
 
 // static
 views::Window* CookiesView::instance_ = NULL;
diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc
index 6492640..daff30e 100644
--- a/chrome/browser/views/options/exceptions_page_view.cc
+++ b/chrome/browser/views/options/exceptions_page_view.cc
@@ -7,13 +7,13 @@
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "views/background.h"
 #include "views/controls/button/native_button.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc
index 7e497c0..d9256ea 100644
--- a/chrome/browser/views/options/fonts_page_view.cc
+++ b/chrome/browser/views/options/fonts_page_view.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
 #include "chrome/browser/shell_dialogs.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
@@ -31,6 +30,7 @@
 #include "views/controls/button/native_button.h"
 #include "views/controls/text_field.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/widget/widget.h"
 
 namespace {
diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index 505d85a..2726b83 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -23,7 +23,6 @@
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/views/keyword_editor_view.h"
 #include "chrome/browser/views/options/options_group_view.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/pref_names.h"
@@ -38,6 +37,7 @@
 #include "views/controls/table/table_view.h"
 #include "views/controls/text_field.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 
 namespace {
 
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index c3b6a29..06d2ad1 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -21,7 +21,6 @@
 #include "chrome/browser/spellchecker.h"
 #include "chrome/browser/views/options/language_combobox_model.h"
 #include "chrome/browser/views/restart_message_box.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/chromium_strings.h"
@@ -34,6 +33,7 @@
 #include "views/controls/tabbed_pane.h"
 #include "views/controls/text_field.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index fa7d3cd..91a617f 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -12,12 +12,12 @@
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/native_theme.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/locale_settings.h"
 #include "grit/generated_resources.h"
 #include "views/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
+#include "views/standard_layout.h"
 
 static const int kLeftColumnWidthChars = 20;
 static const int kOptionsGroupViewColumnSpacing = 30;
diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc
index f7f02cd..77c02ad 100644
--- a/chrome/browser/views/options/passwords_page_view.cc
+++ b/chrome/browser/views/options/passwords_page_view.cc
@@ -7,13 +7,13 @@
 #include "app/l10n_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
 #include "views/background.h"
 #include "views/controls/button/native_button.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 
 using views::ColumnSet;
 using views::GridLayout;
diff --git a/chrome/browser/views/options/passwords_page_view.h b/chrome/browser/views/options/passwords_page_view.h
index a7a30b5..2fd9e46 100644
--- a/chrome/browser/views/options/passwords_page_view.h
+++ b/chrome/browser/views/options/passwords_page_view.h
@@ -7,11 +7,11 @@
 
 #include <vector>
 
+#include "app/gfx/text_elider.h"
 #include "base/scoped_ptr.h"
 #include "base/stl_util-inl.h"
 #include "chrome/browser/views/options/options_page_view.h"
 #include "chrome/browser/webdata/web_data_service.h"
-#include "chrome/common/gfx/text_elider.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/table/table_view.h"
diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc
index ad37f7b..7f73092 100644
--- a/chrome/browser/views/page_info_window.cc
+++ b/chrome/browser/views/page_info_window.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/ssl/ssl_manager.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/win_util.h"
@@ -32,6 +31,7 @@
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/controls/separator.h"
+#include "views/standard_layout.h"
 
 using base::Time;
 
diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc
index 074fec6..ff9c0a3 100644
--- a/chrome/browser/views/select_profile_dialog.cc
+++ b/chrome/browser/views/select_profile_dialog.cc
@@ -11,7 +11,6 @@
 #include "base/string_util.h"
 #include "chrome/browser/user_data_manager.h"
 #include "chrome/browser/views/new_profile_dialog.h"
-#include "chrome/browser/views/standard_layout.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -19,6 +18,7 @@
 #include "views/controls/label.h"
 #include "views/controls/message_box_view.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/view.h"
 #include "views/window/window.h"
 
diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc
index 70c4e71..b609ad4 100644
--- a/chrome/browser/views/shelf_item_dialog.cc
+++ b/chrome/browser/views/shelf_item_dialog.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/browser/views/shelf_item_dialog.h"
 
+#include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/png_decoder.h"
@@ -12,8 +13,6 @@
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
-#include "chrome/browser/views/standard_layout.h"
-#include "chrome/common/gfx/text_elider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "grit/generated_resources.h"
@@ -25,6 +24,7 @@
 #include "views/controls/text_field.h"
 #include "views/focus/focus_manager.h"
 #include "views/grid_layout.h"
+#include "views/standard_layout.h"
 #include "views/widget/widget.h"
 
 using base::Time;
diff --git a/chrome/browser/views/standard_layout.h b/chrome/browser/views/standard_layout.h
deleted file mode 100644
index d72c7f3..0000000
--- a/chrome/browser/views/standard_layout.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright (c) 2006-2008 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_STANDARD_LAYOUT_H__
-#define CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__
-
-#include "views/grid_layout.h"
-
-//
-// This file contains some constants we use to implement our standard panel
-// layout.
-// see: spec 21/4
-
-// Left or right margin.
-const int kPanelHorizMargin = 13;
-
-// Top or bottom margin.
-const int kPanelVertMargin = 13;
-
-// If some UI has some sub UI. Indent horizontally by the following value.
-const int kPanelHorizIndentation = 24;
-
-// When several controls are aligned vertically, the baseline should be spaced
-// by the following number of pixels.
-const int kPanelVerticalSpacing = 32;
-
-// Vertical spacing between sub UI.
-const int kPanelSubVerticalSpacing = 24;
-
-// Vertical spacing between a label and some control.
-const int kLabelToControlVerticalSpacing = 8;
-
-// Vertical spacing between controls that are logically related.
-const int kRelatedControlVerticalSpacing = 8;
-
-// Small vertical spacing between controls that are logically related.
-const int kRelatedControlSmallVerticalSpacing = 4;
-
-// Vertical spacing between controls that are logically unrelated.
-const int kUnrelatedControlVerticalSpacing = 20;
-
-// Larger vertical spacing between unrelated controls.
-const int kUnrelatedControlLargeVerticalSpacing = 30;
-
-// Small horizontal spacing between controls that are logically related.
-const int kRelatedControlSmallHorizontalSpacing = 8;
-
-// Horizontal spacing between controls that are logically related.
-const int kRelatedControlHorizontalSpacing = 8;
-
-// Horizontal spacing between controls that are logically unrelated.
-const int kUnrelatedControlHorizontalSpacing = 12;
-
-// Larger horizontal spacing between unrelated controls.
-const int kUnrelatedControlLargeHorizontalSpacing = 20;
-
-// Vertical spacing between the edge of the window and the
-// top or bottom of a button.
-const int kButtonVEdgeMargin = 6;
-
-// Vertical spacing between the edge of the window and the
-// left or right of a button.
-const int kButtonHEdgeMargin = 7;
-
-// Horizontal spacing between buttons that are logically related.
-const int kRelatedButtonHSpacing = 6;
-
-// Creates a GridLayout with kPanel*Margin insets.
-static views::GridLayout* CreatePanelGridLayout(views::View* host) {
-  views::GridLayout* layout = new views::GridLayout(host);
-  layout->SetInsets(kPanelVertMargin, kPanelHorizMargin,
-                    kPanelVertMargin, kPanelHorizMargin);
-  return layout;
-}
-
-#endif  // CHROME_BROWSER_VIEWS_STANDARD_LAYOUT_H__
diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc
index d44c967..6468c7a 100644
--- a/chrome/browser/views/status_bubble_views.cc
+++ b/chrome/browser/views/status_bubble_views.cc
@@ -7,12 +7,12 @@
 #include <algorithm>
 
 #include "app/gfx/chrome_canvas.h"
+#include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "app/animation.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
-#include "chrome/common/gfx/text_elider.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index f4657eb..38cc412 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/character_encoding.h"
-#include "chrome/browser/drag_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
@@ -50,6 +49,7 @@
 #include "views/controls/button/button_dropdown.h"
 #include "views/controls/hwnd_view.h"
 #include "views/controls/label.h"
+#include "views/drag_utils.h"
 #include "views/widget/tooltip_manager.h"
 #include "views/window/non_client_view.h"
 #include "views/window/window.h"
@@ -829,7 +829,8 @@ void BrowserToolbarView::WriteDragData(views::View* sender,
 
   drag_utils::SetURLAndDragImage(tab_->GetURL(),
                                  UTF16ToWideHack(tab_->GetTitle()),
-                                 tab_->GetFavIcon(), data);
+                                 tab_->GetFavIcon(),
+                                 data);
 }
 
 TabContents* BrowserToolbarView::GetTabContents() {