diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 04:56:55 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 04:56:55 +0000 |
commit | 6f3290938a0f8a839ce75df6359d36145ba3b6af (patch) | |
tree | 338c21aafe3f28f94a3d7134cf96ad4a13f63459 /chrome/browser | |
parent | 0520d327302fe86f633191d68d56925fd64719fc (diff) | |
download | chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.zip chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.tar.gz chromium_src-6f3290938a0f8a839ce75df6359d36145ba3b6af.tar.bz2 |
Move controls into their own dir under chrome/views/controls
TBR=sky
Review URL: http://codereview.chromium.org/48058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11841 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
129 files changed, 263 insertions, 267 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h index e4c1b02..b69005a 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h @@ -18,7 +18,7 @@ #include "chrome/browser/toolbar_model.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/page_transition_types.h" -#include "chrome/views/menu.h" +#include "chrome/views/controls/menu/menu.h" #include "webkit/glue/window_open_disposition.h" class AutocompletePopupModel; diff --git a/chrome/browser/back_forward_menu_model_win.h b/chrome/browser/back_forward_menu_model_win.h index e4f54e0..c144862 100644 --- a/chrome/browser/back_forward_menu_model_win.h +++ b/chrome/browser/back_forward_menu_model_win.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "chrome/browser/back_forward_menu_model.h" -#include "chrome/views/menu.h" +#include "chrome/views/controls/menu/menu.h" class SkBitmap; diff --git a/chrome/browser/bookmarks/bookmark_context_menu.h b/chrome/browser/bookmarks/bookmark_context_menu.h index 460f01d..464e0e0 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu.h +++ b/chrome/browser/bookmarks/bookmark_context_menu.h @@ -13,7 +13,7 @@ // TODO(port): Port this file. #if defined(OS_WIN) -#include "chrome/views/chrome_menu.h" +#include "chrome/views/controls/menu/chrome_menu.h" #else #include "chrome/common/temp_scaffolding_stubs.h" #endif diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.h b/chrome/browser/bookmarks/bookmark_folder_tree_model.h index e82c114..aa83756 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model.h +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_FOLDER_TREE_MODEL_H_ #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/views/tree_node_model.h" +#include "chrome/views/controls/tree/tree_node_model.h" // The type of nodes created by BookmarkFolderTreeModel. typedef views::TreeNodeWithValue<BookmarkNode*> FolderNode; diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc index 3fb7567..693069d 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model_unittest.cc @@ -5,7 +5,7 @@ #include "base/string_util.h" #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" #include "chrome/test/testing_profile.h" -#include "chrome/views/tree_view.h" +#include "chrome/views/controls/tree/tree_view.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/bookmarks/bookmark_menu_controller.h b/chrome/browser/bookmarks/bookmark_menu_controller.h index 27636a7..71d3a74 100644 --- a/chrome/browser/bookmarks/bookmark_menu_controller.h +++ b/chrome/browser/bookmarks/bookmark_menu_controller.h @@ -10,7 +10,7 @@ #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" -#include "chrome/views/chrome_menu.h" +#include "chrome/views/controls/menu/chrome_menu.h" class BookmarkContextMenu; class BookmarkNode; diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h index bd94c12..f3b05a5 100644 --- a/chrome/browser/bookmarks/bookmark_model.h +++ b/chrome/browser/bookmarks/bookmark_model.h @@ -16,7 +16,7 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/history/history_types.h" #include "chrome/common/notification_observer.h" -#include "chrome/views/tree_node_model.h" +#include "chrome/views/controls/tree/tree_node_model.h" #include "googleurl/src/gurl.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index 974e618..09b14bb 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "chrome/test/testing_profile.h" -#include "chrome/views/tree_node_model.h" +#include "chrome/views/controls/tree/tree_node_model.h" #include "testing/gtest/include/gtest/gtest.h" using base::Time; diff --git a/chrome/browser/bookmarks/bookmark_table_model.h b/chrome/browser/bookmarks/bookmark_table_model.h index d5b4a2b..4b55759 100644 --- a/chrome/browser/bookmarks/bookmark_table_model.h +++ b/chrome/browser/bookmarks/bookmark_table_model.h @@ -10,7 +10,7 @@ #include "build/build_config.h" #if defined(OS_WIN) -#include "chrome/views/table_view.h" +#include "chrome/views/controls/table/table_view.h" #elif defined(OS_POSIX) #include "chrome/common/temp_scaffolding_stubs.h" #endif diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 3fbbbb9..429c06d 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -16,8 +16,8 @@ #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/l10n_util.h" +#include "chrome/views/controls/tree/tree_node_iterator.h" #include "chrome/views/event.h" -#include "chrome/views/tree_node_iterator.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/debugger/debugger_view.cc b/chrome/browser/debugger/debugger_view.cc index 19c9196..9ada4eb 100644 --- a/chrome/browser/debugger/debugger_view.cc +++ b/chrome/browser/debugger/debugger_view.cc @@ -23,9 +23,9 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/native_scroll_bar.h" -#include "chrome/views/scroll_view.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/scrollbar/native_scroll_bar.h" +#include "chrome/views/controls/scroll_view.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/view.h" #include "grit/debugger_resources.h" diff --git a/chrome/browser/debugger/debugger_view.h b/chrome/browser/debugger/debugger_view.h index 6c6457e..be2350c 100644 --- a/chrome/browser/debugger/debugger_view.h +++ b/chrome/browser/debugger/debugger_view.h @@ -13,7 +13,7 @@ #include "base/gfx/size.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/views/view.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/text_field.h" class DebuggerView; class DebuggerWindow; diff --git a/chrome/browser/download/download_request_dialog_delegate_win.cc b/chrome/browser/download/download_request_dialog_delegate_win.cc index 13cdc42..2ff9a24 100644 --- a/chrome/browser/download/download_request_dialog_delegate_win.cc +++ b/chrome/browser/download/download_request_dialog_delegate_win.cc @@ -7,7 +7,7 @@ #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/message_box_view.h" +#include "chrome/views/controls/message_box_view.h" #include "grit/generated_resources.h" // static diff --git a/chrome/browser/download/download_util.h b/chrome/browser/download/download_util.h index 3d0f5c9..1b3f777 100644 --- a/chrome/browser/download/download_util.h +++ b/chrome/browser/download/download_util.h @@ -14,8 +14,8 @@ #include "base/basictypes.h" #include "base/task.h" +#include "chrome/views/controls/menu/menu.h" #include "chrome/views/event.h" -#include "chrome/views/menu.h" #include "chrome/views/view.h" class BaseDownloadItemModel; diff --git a/chrome/browser/encoding_menu_controller_delegate.h b/chrome/browser/encoding_menu_controller_delegate.h index e1fa213..12d9bf4 100644 --- a/chrome/browser/encoding_menu_controller_delegate.h +++ b/chrome/browser/encoding_menu_controller_delegate.h @@ -5,7 +5,7 @@ #ifndef CHORME_BROWSER_ENCODING_MENU_CONTROLLER_DELEGATE_H__ #define CHORME_BROWSER_ENCODING_MENU_CONTROLLER_DELEGATE_H__ -#include "chrome/views/menu.h" +#include "chrome/views/controls/menu/menu.h" class Browser; class Controller; diff --git a/chrome/browser/history/starred_url_database.h b/chrome/browser/history/starred_url_database.h index e827cc1..434fab7 100644 --- a/chrome/browser/history/starred_url_database.h +++ b/chrome/browser/history/starred_url_database.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "chrome/browser/history/history_types.h" #include "chrome/browser/history/url_database.h" -#include "chrome/views/tree_node_model.h" +#include "chrome/views/controls/tree/tree_node_model.h" #include "testing/gtest/include/gtest/gtest_prod.h" struct sqlite3; diff --git a/chrome/browser/js_before_unload_handler_win.cc b/chrome/browser/js_before_unload_handler_win.cc index 88a3eec..e550018 100644 --- a/chrome/browser/js_before_unload_handler_win.cc +++ b/chrome/browser/js_before_unload_handler_win.cc @@ -6,7 +6,7 @@ #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/message_box_view.h" +#include "chrome/views/controls/message_box_view.h" #include "grit/generated_resources.h" void RunBeforeUnloadDialog(WebContents* web_contents, diff --git a/chrome/browser/jsmessage_box_handler_win.cc b/chrome/browser/jsmessage_box_handler_win.cc index a31bed6..1b6ef07 100644 --- a/chrome/browser/jsmessage_box_handler_win.cc +++ b/chrome/browser/jsmessage_box_handler_win.cc @@ -15,7 +15,7 @@ #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/views/message_box_view.h" +#include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index 26e4fde..2d6e8d2 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -35,8 +35,7 @@ #include "chrome/browser/load_notification_details.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/views/decision.h" -#include "chrome/views/link.h" +#include "chrome/views/controls/link.h" #else #include "chrome/common/temp_scaffolding_stubs.h" #endif diff --git a/chrome/browser/tab_contents/render_view_context_menu_win.h b/chrome/browser/tab_contents/render_view_context_menu_win.h index a53d2ef..db74b5e 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_win.h +++ b/chrome/browser/tab_contents/render_view_context_menu_win.h @@ -7,7 +7,7 @@ #include "chrome/browser/tab_contents/render_view_context_menu.h" #include "chrome/views/accelerator.h" -#include "chrome/views/menu.h" +#include "chrome/views/controls/menu/menu.h" class RenderViewContextMenuWin : public RenderViewContextMenu, public Menu::Delegate{ diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 0e8f6e4..d7dacb2 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -21,7 +21,7 @@ #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/views/download_started_animation.h" #include "chrome/browser/views/blocked_popup_container.h" -#include "chrome/views/native_scroll_bar.h" +#include "chrome/views/controls/scrollbar/native_scroll_bar.h" #endif #if defined(OS_WIN) diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h index a1f54a3..ab27fef 100644 --- a/chrome/browser/task_manager.h +++ b/chrome/browser/task_manager.h @@ -15,7 +15,7 @@ #include "base/timer.h" #include "chrome/browser/cache_manager_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/views/group_table_view.h" +#include "chrome/views/controls/table/group_table_view.h" #include "chrome/views/window/dialog_delegate.h" #include "net/url_request/url_request_job_tracker.h" diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index 6547523..fe9eb5d 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -20,8 +20,8 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/install_util.h" -#include "chrome/views/text_field.h" -#include "chrome/views/throbber.h" +#include "chrome/views/controls/text_field.h" +#include "chrome/views/controls/throbber.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h index 5f775de7..2118e76 100644 --- a/chrome/browser/views/about_chrome_view.h +++ b/chrome/browser/views/about_chrome_view.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_VIEWS_ABOUT_CHROME_VIEW_H_ #include "chrome/browser/google_update.h" -#include "chrome/views/image_view.h" -#include "chrome/views/label.h" -#include "chrome/views/link.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/link.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc index 4e174c1..6bbd356 100644 --- a/chrome/browser/views/about_ipc_dialog.cc +++ b/chrome/browser/views/about_ipc_dialog.cc @@ -25,8 +25,8 @@ #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/hwnd_view.h" -#include "chrome/views/text_button.h" +#include "chrome/views/controls/button/text_button.h" +#include "chrome/views/controls/hwnd_view.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h index a5ff38d..92cc284 100644 --- a/chrome/browser/views/about_ipc_dialog.h +++ b/chrome/browser/views/about_ipc_dialog.h @@ -5,17 +5,11 @@ #ifndef CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_ #define CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_ -#include <atlbase.h> -#include <atlapp.h> -#include <atlcrack.h> -#include <atlctrls.h> -#include <atlmisc.h> - #include "base/singleton.h" #include "chrome/common/ipc_logging.h" -#include "chrome/views/button.h" +#include "chrome/views/controls/button/button.h" +#include "chrome/views/controls/table/table_view.h" #include "chrome/views/window/dialog_delegate.h" -#include "chrome/views/table_view.h" #if defined(OS_WIN) && defined(IPC_MESSAGE_LOG_ENABLED) diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc index 3386043a..b11ae0b 100644 --- a/chrome/browser/views/about_network_dialog.cc +++ b/chrome/browser/views/about_network_dialog.cc @@ -9,8 +9,8 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/text_button.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/button/text_button.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/window/window.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" diff --git a/chrome/browser/views/about_network_dialog.h b/chrome/browser/views/about_network_dialog.h index 389e582..b10cf04 100644 --- a/chrome/browser/views/about_network_dialog.h +++ b/chrome/browser/views/about_network_dialog.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_ABOUT_NETWORK_DIALOG_H_ #include "base/singleton.h" -#include "chrome/views/button.h" +#include "chrome/views/controls/button/button.h" #include "chrome/views/window/dialog_delegate.h" namespace views { diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index 8ae1801..5a80f03 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -22,8 +22,8 @@ #include "chrome/common/pref_names.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" -#include "chrome/views/image_button.h" -#include "chrome/views/menu_button.h" +#include "chrome/views/controls/button/image_button.h" +#include "chrome/views/controls/button/menu_button.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h index 829e19a..b853b6d 100644 --- a/chrome/browser/views/blocked_popup_container.h +++ b/chrome/browser/views/blocked_popup_container.h @@ -18,8 +18,8 @@ #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/common/animation.h" #include "chrome/common/pref_member.h" -#include "chrome/views/button.h" -#include "chrome/views/menu.h" +#include "chrome/views/controls/button/button.h" +#include "chrome/views/controls/menu/menu.h" #include "chrome/views/view.h" #include "chrome/views/widget/widget_win.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 79b3ce9..3fe0dbf 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -31,8 +31,8 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/chrome_menu.h" -#include "chrome/views/menu_button.h" +#include "chrome/views/controls/button/menu_button.h" +#include "chrome/views/controls/menu/chrome_menu.h" #include "chrome/views/view_constants.h" #include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h index 14d7c81..358ce6f 100644 --- a/chrome/browser/views/bookmark_bar_view.h +++ b/chrome/browser/views/bookmark_bar_view.h @@ -10,11 +10,11 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/common/slide_animation.h" -#include "chrome/views/label.h" -#include "chrome/views/menu.h" -#include "chrome/views/menu_button.h" +#include "chrome/views/controls/button/menu_button.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/menu/menu.h" +#include "chrome/views/controls/menu/view_menu_delegate.h" #include "chrome/views/view.h" -#include "chrome/views/view_menu_delegate.h" class Browser; class PageNavigator; diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc index 579c037..3fe05c1 100644 --- a/chrome/browser/views/bookmark_bar_view_test.cc +++ b/chrome/browser/views/bookmark_bar_view_test.cc @@ -13,8 +13,8 @@ #include "chrome/common/pref_service.h" #include "chrome/test/testing_profile.h" #include "chrome/test/interactive_ui/view_event_test_base.h" -#include "chrome/views/chrome_menu.h" -#include "chrome/views/text_button.h" +#include "chrome/views/controls/button/text_button.h" +#include "chrome/views/controls/menu/chrome_menu.h" #include "chrome/views/window/window.h" namespace { diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 899b5be..3e4db18 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -16,10 +16,10 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/button.h" -#include "chrome/views/checkbox.h" -#include "chrome/views/native_button.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/button/button.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/text_field.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/bookmark_bubble_view.h b/chrome/browser/views/bookmark_bubble_view.h index 31c8c8c..3109d8e 100644 --- a/chrome/browser/views/bookmark_bubble_view.h +++ b/chrome/browser/views/bookmark_bubble_view.h @@ -7,9 +7,9 @@ #include "base/gfx/rect.h" #include "chrome/browser/views/info_bubble.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/link.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/link.h" #include "chrome/views/view.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index 3c030ba..d88aa9b7 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -15,7 +15,7 @@ #include "chrome/views/background.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" +#include "chrome/views/controls/label.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/window.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h index bf9be29..932d9b7 100644 --- a/chrome/browser/views/bookmark_editor_view.h +++ b/chrome/browser/views/bookmark_editor_view.h @@ -8,12 +8,12 @@ #include <set> #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/views/checkbox.h" -#include "chrome/views/menu.h" -#include "chrome/views/native_button.h" -#include "chrome/views/text_field.h" -#include "chrome/views/tree_node_model.h" -#include "chrome/views/tree_view.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/menu/menu.h" +#include "chrome/views/controls/text_field.h" +#include "chrome/views/controls/tree/tree_node_model.h" +#include "chrome/views/controls/tree/tree_view.h" #include "chrome/views/window/dialog_delegate.h" namespace views { diff --git a/chrome/browser/views/bookmark_folder_tree_view.h b/chrome/browser/views/bookmark_folder_tree_view.h index f024e75..cfae928 100644 --- a/chrome/browser/views/bookmark_folder_tree_view.h +++ b/chrome/browser/views/bookmark_folder_tree_view.h @@ -9,7 +9,7 @@ #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_drop_info.h" #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" -#include "chrome/views/tree_view.h" +#include "chrome/views/controls/tree/tree_view.h" class BookmarkModel; class BookmarkNode; diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index 1aec366..d59de81 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -27,9 +27,9 @@ #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/menu_button.h" -#include "chrome/views/single_split_view.h" +#include "chrome/views/controls/button/menu_button.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/single_split_view.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/window.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/bookmark_manager_view.h b/chrome/browser/views/bookmark_manager_view.h index aef8896..1b044bd 100644 --- a/chrome/browser/views/bookmark_manager_view.h +++ b/chrome/browser/views/bookmark_manager_view.h @@ -10,11 +10,11 @@ #include "chrome/browser/bookmarks/bookmark_context_menu.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/views/table_view.h" -#include "chrome/views/text_field.h" -#include "chrome/views/tree_view.h" +#include "chrome/views/controls/menu/view_menu_delegate.h" +#include "chrome/views/controls/table/table_view.h" +#include "chrome/views/controls/text_field.h" +#include "chrome/views/controls/tree/tree_view.h" #include "chrome/views/view.h" -#include "chrome/views/view_menu_delegate.h" #include "chrome/views/window/window_delegate.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/views/bookmark_table_view.h b/chrome/browser/views/bookmark_table_view.h index 9568bb4..272bba3 100644 --- a/chrome/browser/views/bookmark_table_view.h +++ b/chrome/browser/views/bookmark_table_view.h @@ -7,8 +7,8 @@ #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_drop_info.h" -#include "chrome/views/menu.h" -#include "chrome/views/table_view.h" +#include "chrome/views/controls/menu/menu.h" +#include "chrome/views/controls/table/table_view.h" class BookmarkModel; class BookmarkNode; diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index b5c3725..0256758 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -18,9 +18,9 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" -#include "chrome/views/checkbox.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/label.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/bug_report_view.h b/chrome/browser/views/bug_report_view.h index b539b3c..859f7fe 100644 --- a/chrome/browser/views/bug_report_view.h +++ b/chrome/browser/views/bug_report_view.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_VIEWS_BUGREPORT_VIEW_H_ #include "chrome/browser/net/url_fetcher.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/native_button.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index d61faba..bbfba5d 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -9,10 +9,10 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/background.h" -#include "chrome/views/checkbox.h" -#include "chrome/views/label.h" -#include "chrome/views/native_button.h" -#include "chrome/views/throbber.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/throbber.h" #include "chrome/views/window/window.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h index e70f058..3a387fd 100644 --- a/chrome/browser/views/clear_browsing_data.h +++ b/chrome/browser/views/clear_browsing_data.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_VIEWS_CLEAR_BROWSING_DATA_H__ #include "chrome/browser/browsing_data_remover.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/label.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/label.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index b4da000..a6cd377 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -25,9 +25,9 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/image_button.h" +#include "chrome/views/controls/button/image_button.h" +#include "chrome/views/controls/hwnd_view.h" #include "chrome/views/focus/focus_manager.h" -#include "chrome/views/hwnd_view.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/non_client_view.h" #include "chrome/views/window/window_resources.h" diff --git a/chrome/browser/views/dom_view.h b/chrome/browser/views/dom_view.h index d79c012..3a4e6d0 100644 --- a/chrome/browser/views/dom_view.h +++ b/chrome/browser/views/dom_view.h @@ -8,7 +8,7 @@ #ifndef CHROME_BROWSER_VIEWS_DOM_VIEW_H_ #define CHROME_BROWSER_VIEWS_DOM_VIEW_H_ -#include "chrome/views/hwnd_view.h" +#include "chrome/views/controls/hwnd_view.h" #include "googleurl/src/gurl.h" class DOMUIHost; diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index dec54e0..de402da 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -17,8 +17,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/menu.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/menu/menu.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/download_item_view.h b/chrome/browser/views/download_item_view.h index b7a95dc..8f87c04 100644 --- a/chrome/browser/views/download_item_view.h +++ b/chrome/browser/views/download_item_view.h @@ -26,7 +26,7 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/browser/icon_manager.h" #include "chrome/views/event.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" #include "chrome/views/view.h" namespace views { diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 21cd338..b5045c9 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -16,8 +16,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" -#include "chrome/views/image_button.h" -#include "chrome/views/image_view.h" +#include "chrome/views/controls/button/image_button.h" +#include "chrome/views/controls/image_view.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h index 1cd7907..d73aa9f 100644 --- a/chrome/browser/views/download_shelf_view.h +++ b/chrome/browser/views/download_shelf_view.h @@ -7,8 +7,8 @@ #include "chrome/browser/download/download_shelf.h" #include "chrome/common/slide_animation.h" -#include "chrome/views/button.h" -#include "chrome/views/link.h" +#include "chrome/views/controls/button/button.h" +#include "chrome/views/controls/link.h" namespace views { class ImageButton; diff --git a/chrome/browser/views/download_started_animation.h b/chrome/browser/views/download_started_animation.h index e083d67..f2c7916 100644 --- a/chrome/browser/views/download_started_animation.h +++ b/chrome/browser/views/download_started_animation.h @@ -8,7 +8,7 @@ #include "base/gfx/rect.h" #include "chrome/common/animation.h" #include "chrome/common/notification_observer.h" -#include "chrome/views/image_view.h" +#include "chrome/views/controls/image_view.h" namespace views { class WidgetWin; diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 0f336d0..1968d27 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -14,10 +14,10 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/label.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/table/table_view.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/image_view.h" -#include "chrome/views/table_view.h" #include "chrome/views/window/window.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/edit_keyword_controller.h b/chrome/browser/views/edit_keyword_controller.h index f6f693b..a94422e 100644 --- a/chrome/browser/views/edit_keyword_controller.h +++ b/chrome/browser/views/edit_keyword_controller.h @@ -12,7 +12,7 @@ #include <Windows.h> -#include "chrome/views/text_field.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/window/dialog_delegate.h" namespace views { diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc index 5b4ee4c..99ee16a 100644 --- a/chrome/browser/views/external_protocol_dialog.cc +++ b/chrome/browser/views/external_protocol_dialog.cc @@ -12,7 +12,7 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/message_box_view.h" +#include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index 56dfd29..646b49c 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -15,8 +15,8 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" -#include "chrome/views/image_button.h" -#include "chrome/views/label.h" +#include "chrome/views/controls/button/image_button.h" +#include "chrome/views/controls/label.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/include/SkGradientShader.h" diff --git a/chrome/browser/views/find_bar_view.h b/chrome/browser/views/find_bar_view.h index 2b5748a..148fa83d 100644 --- a/chrome/browser/views/find_bar_view.h +++ b/chrome/browser/views/find_bar_view.h @@ -7,8 +7,8 @@ #include "base/gfx/size.h" #include "chrome/browser/find_notification_details.h" -#include "chrome/views/button.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/button/button.h" +#include "chrome/views/controls/text_field.h" class FindBarWin; diff --git a/chrome/browser/views/find_bar_win.cc b/chrome/browser/views/find_bar_win.cc index b10c5e3..d653df4 100644 --- a/chrome/browser/views/find_bar_win.cc +++ b/chrome/browser/views/find_bar_win.cc @@ -16,7 +16,7 @@ #include "chrome/browser/tab_contents/web_contents_view.h" #include "chrome/views/focus/external_focus_tracker.h" #include "chrome/views/focus/view_storage.h" -#include "chrome/views/native_scroll_bar.h" +#include "chrome/views/controls/scrollbar/native_scroll_bar.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget_win.h" diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index 313689d..043a972 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -15,8 +15,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/event.h" -#include "chrome/views/label.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/label.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index 307753c..1ec7af9 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -10,11 +10,11 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/checkbox.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/image_view.h" -#include "chrome/views/label.h" -#include "chrome/views/throbber.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/throbber.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/first_run_customize_view.h b/chrome/browser/views/first_run_customize_view.h index 9a7a596..9727bd8 100644 --- a/chrome/browser/views/first_run_customize_view.h +++ b/chrome/browser/views/first_run_customize_view.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_VIEWS_FIRST_RUN_CUSTOMIZE_VIEW_H_ #include "chrome/browser/views/first_run_view_base.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/combo_box.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index 910cab6..d67f8b1 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -11,11 +11,11 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/checkbox.h" -#include "chrome/views/image_view.h" -#include "chrome/views/label.h" -#include "chrome/views/throbber.h" -#include "chrome/views/separator.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/throbber.h" +#include "chrome/views/controls/separator.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/first_run_view.h b/chrome/browser/views/first_run_view.h index e17f78d..267756b 100644 --- a/chrome/browser/views/first_run_view.h +++ b/chrome/browser/views/first_run_view.h @@ -7,7 +7,7 @@ #include "chrome/browser/views/first_run_view_base.h" #include "chrome/browser/views/first_run_customize_view.h" -#include "chrome/views/link.h" +#include "chrome/views/controls/link.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index f0dc653..124c05e 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -20,11 +20,11 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/background.h" -#include "chrome/views/checkbox.h" -#include "chrome/views/image_view.h" -#include "chrome/views/label.h" -#include "chrome/views/throbber.h" -#include "chrome/views/separator.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/throbber.h" +#include "chrome/views/controls/separator.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 19e3e56..7af2338 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -50,7 +50,7 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/native_scroll_bar.h" +#include "chrome/views/controls/scrollbar/native_scroll_bar.h" #include "chrome/views/view.h" #include "chrome/views/widget/hwnd_notification_source.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h index 0796ed9..d1a57a5 100644 --- a/chrome/browser/views/frame/browser_view.h +++ b/chrome/browser/views/frame/browser_view.h @@ -9,11 +9,11 @@ #include "chrome/browser/browser_window.h" #include "chrome/browser/hang_monitor/hung_plugin_action.h" #include "chrome/browser/hang_monitor/hung_window_detector.h" -#include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/browser/views/frame/browser_frame.h" #ifdef CHROME_PERSONALIZATION #include "chrome/personalization/personalization.h" #endif +#include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/views/frame/browser_frame.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/window_delegate.h" diff --git a/chrome/browser/views/frame/glass_browser_frame_view.h b/chrome/browser/views/frame/glass_browser_frame_view.h index b2ca45b..b6aa5f9 100644 --- a/chrome/browser/views/frame/glass_browser_frame_view.h +++ b/chrome/browser/views/frame/glass_browser_frame_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_FRAME_GLASS_BROWSER_FRAME_VIEW_H_ #include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/views/button.h" +#include "chrome/views/controls/button/button.h" #include "chrome/views/window/non_client_view.h" class BrowserView; diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 665cefd..e2093f8 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -13,7 +13,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/image_button.h" +#include "chrome/views/controls/button/image_button.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/window/window_resources.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.h b/chrome/browser/views/frame/opaque_browser_frame_view.h index df255fe..83a84c5 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.h +++ b/chrome/browser/views/frame/opaque_browser_frame_view.h @@ -7,7 +7,7 @@ #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/tab_icon_view.h" -#include "chrome/views/button.h" +#include "chrome/views/controls/button/button.h" #include "chrome/views/window/non_client_view.h" class BrowserView; diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h index 146eed8..b5e6b1e 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.h +++ b/chrome/browser/views/fullscreen_exit_bubble.h @@ -8,7 +8,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/command_updater.h" #include "chrome/common/slide_animation.h" -#include "chrome/views/link.h" +#include "chrome/views/controls/link.h" #include "chrome/views/widget/widget_win.h" // FullscreenExitBubble is responsible for showing a bubble atop the screen in diff --git a/chrome/browser/views/go_button.h b/chrome/browser/views/go_button.h index 306ae59..c9d8252 100644 --- a/chrome/browser/views/go_button.h +++ b/chrome/browser/views/go_button.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_GO_BUTTON_H__ #define CHROME_BROWSER_VIEWS_GO_BUTTON_H__ -#include "chrome/views/image_button.h" +#include "chrome/views/controls/button/image_button.h" #include "base/task.h" class CommandUpdater; diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc index 3ef3214..bf0555a4 100644 --- a/chrome/browser/views/hung_renderer_view.cc +++ b/chrome/browser/views/hung_renderer_view.cc @@ -16,10 +16,10 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/result_codes.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/group_table_view.h" -#include "chrome/views/image_view.h" -#include "chrome/views/label.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/table/group_table_view.h" #include "chrome/views/window/client_view.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/hwnd_html_view.h b/chrome/browser/views/hwnd_html_view.h index 49c6e34..b4a0d6a 100644 --- a/chrome/browser/views/hwnd_html_view.h +++ b/chrome/browser/views/hwnd_html_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_HWND_HTML_VIEW_H_ #include "googleurl/src/gurl.h" -#include "chrome/views/hwnd_view.h" +#include "chrome/views/controls/hwnd_view.h" class RenderViewHost; class RenderViewHostDelegate; diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc index 060ffca..7c6b809 100644 --- a/chrome/browser/views/importer_lock_view.cc +++ b/chrome/browser/views/importer_lock_view.cc @@ -7,7 +7,7 @@ #include "chrome/browser/importer/importer.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/label.h" +#include "chrome/views/controls/label.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc index 76fb533..9dbd9a4 100644 --- a/chrome/browser/views/importer_view.cc +++ b/chrome/browser/views/importer_view.cc @@ -7,9 +7,9 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/checkbox.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/label.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" #include "chrome/views/window/window.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/importer_view.h b/chrome/browser/views/importer_view.h index fcae46d..ef80f9d 100644 --- a/chrome/browser/views/importer_view.h +++ b/chrome/browser/views/importer_view.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_VIEWS_IMPORTER_VIEW_H__ #include "chrome/browser/importer/importer.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/combo_box.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index b097cb3..d7dcf81 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -7,8 +7,8 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/throbber.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/throbber.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index 7dea4c9..52af060 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -12,10 +12,10 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/slide_animation.h" #include "chrome/views/background.h" -#include "chrome/views/image_button.h" +#include "chrome/views/controls/button/image_button.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/label.h" #include "chrome/views/focus/external_focus_tracker.h" -#include "chrome/views/image_view.h" -#include "chrome/views/label.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/infobars/infobars.h b/chrome/browser/views/infobars/infobars.h index c7a0d38..c8b721dc 100644 --- a/chrome/browser/views/infobars/infobars.h +++ b/chrome/browser/views/infobars/infobars.h @@ -7,9 +7,9 @@ #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/common/animation.h" -#include "chrome/views/button.h" -#include "chrome/views/link.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/button.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/link.h" class InfoBarContainer; class SlideAnimation; diff --git a/chrome/browser/views/input_window.cc b/chrome/browser/views/input_window.cc index eb61945..f650320 100644 --- a/chrome/browser/views/input_window.cc +++ b/chrome/browser/views/input_window.cc @@ -9,8 +9,8 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/window/window.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index e2267eb..b646f10 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -21,9 +21,9 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" #include "chrome/views/background.h" -#include "chrome/views/checkbox.h" +#include "chrome/views/controls/button/checkbox.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/keyword_editor_view.h b/chrome/browser/views/keyword_editor_view.h index 8b0f1d1..a011d61 100644 --- a/chrome/browser/views/keyword_editor_view.h +++ b/chrome/browser/views/keyword_editor_view.h @@ -9,8 +9,8 @@ #include <map> #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/views/native_button.h" -#include "chrome/views/table_view.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/table/table_view.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" diff --git a/chrome/browser/views/location_bar_view.h b/chrome/browser/views/location_bar_view.h index 99822f4..920fc88 100644 --- a/chrome/browser/views/location_bar_view.h +++ b/chrome/browser/views/location_bar_view.h @@ -15,9 +15,9 @@ #include "chrome/browser/toolbar_model.h" #include "chrome/browser/views/info_bubble.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/views/hwnd_view.h" -#include "chrome/views/image_view.h" -#include "chrome/views/label.h" +#include "chrome/views/controls/hwnd_view.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/label.h" #include "chrome/views/painter.h" class CommandUpdater; diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc index f03afa3..47626cf 100644 --- a/chrome/browser/views/login_view.cc +++ b/chrome/browser/views/login_view.cc @@ -10,8 +10,8 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/widget/root_view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc index 8690116..8b2faea 100644 --- a/chrome/browser/views/new_profile_dialog.cc +++ b/chrome/browser/views/new_profile_dialog.cc @@ -10,8 +10,8 @@ #include "base/file_util.h" #include "chrome/browser/user_data_manager.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/message_box_view.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/message_box_view.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/new_profile_dialog.h b/chrome/browser/views/new_profile_dialog.h index 4e43570..da36728 100644 --- a/chrome/browser/views/new_profile_dialog.h +++ b/chrome/browser/views/new_profile_dialog.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/message_loop.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/window/dialog_delegate.h" class MessageBoxView; diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index fb5ed93..45e0cc2 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -34,10 +34,10 @@ #include "chrome/common/resource_bundle.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/views/background.h" -#include "chrome/views/checkbox.h" -#include "chrome/views/combo_box.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/scroll_view.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/scroll_view.h" #include "chrome/views/widget/widget.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index c2ac09f..9e9f1e3 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -13,10 +13,10 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" +#include "chrome/views/controls/message_box_view.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/scroll_view.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/message_box_view.h" -#include "chrome/views/native_button.h" -#include "chrome/views/scroll_view.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/options/advanced_page_view.h b/chrome/browser/views/options/advanced_page_view.h index ac2fb80..54aa8a1 100644 --- a/chrome/browser/views/options/advanced_page_view.h +++ b/chrome/browser/views/options/advanced_page_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_OPTIONS_ADVANCED_PAGE_VIEW_H_ #include "chrome/browser/views/options/options_page_view.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" class AdvancedOptionsListModel; class AdvancedScrollViewContainer; diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 70f6f36..18a7550 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -23,11 +23,11 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/checkbox.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/button/radio_button.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/native_button.h" -#include "chrome/views/radio_button.h" -#include "chrome/views/text_field.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/options/content_page_view.h b/chrome/browser/views/options/content_page_view.h index ed9b45b..3d68bb5 100644 --- a/chrome/browser/views/options/content_page_view.h +++ b/chrome/browser/views/options/content_page_view.h @@ -8,7 +8,7 @@ #include "chrome/browser/views/options/options_page_view.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/common/pref_member.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" #include "chrome/views/view.h" namespace views { diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index 594e5e2..e31fc1e0 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -17,9 +17,9 @@ #include "chrome/common/win_util.h" #include "chrome/views/border.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/text_field.h" -#include "chrome/views/table_view.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/text_field.h" +#include "chrome/views/controls/table/table_view.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/options/cookies_view.h b/chrome/browser/views/options/cookies_view.h index 1f300cb..1c6aacc 100644 --- a/chrome/browser/views/options/cookies_view.h +++ b/chrome/browser/views/options/cookies_view.h @@ -6,9 +6,9 @@ #define CHROME_BROWSER_VIEWS_OPTIONS_COOKIES_VIEW_H__ #include "base/task.h" -#include "chrome/views/native_button.h" -#include "chrome/views/table_view.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/table/table_view.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/options/fonts_languages_window_view.h b/chrome/browser/views/options/fonts_languages_window_view.h index 0ddc3d5..5d0fae3 100644 --- a/chrome/browser/views/options/fonts_languages_window_view.h +++ b/chrome/browser/views/options/fonts_languages_window_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__ #define CHROME_BROWSER_FONTS_LANGUAGE_WINDOW_H__ -#include "chrome/views/tabbed_pane.h" +#include "chrome/views/controls/tabbed_pane.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index a3a31e9..d33b23c 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -24,11 +24,11 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/checkbox.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/button/radio_button.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/native_button.h" -#include "chrome/views/radio_button.h" -#include "chrome/views/text_field.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/options/fonts_page_view.h b/chrome/browser/views/options/fonts_page_view.h index ddc0e62..eb348e6 100644 --- a/chrome/browser/views/options/fonts_page_view.h +++ b/chrome/browser/views/options/fonts_page_view.h @@ -8,8 +8,8 @@ #include "chrome/browser/views/options/options_page_view.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/common/pref_member.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/button/native_button.h" #include "chrome/views/view.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 3fbc161c..a1abb9b 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -28,12 +28,12 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/checkbox.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/button/radio_button.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/table/table_view.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/radio_button.h" -#include "chrome/views/table_view.h" -#include "chrome/views/text_field.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/options/general_page_view.h b/chrome/browser/views/options/general_page_view.h index 9bee7fe..eea9cf1 100644 --- a/chrome/browser/views/options/general_page_view.h +++ b/chrome/browser/views/options/general_page_view.h @@ -8,8 +8,8 @@ #include "chrome/browser/views/options/options_page_view.h" #include "chrome/browser/views/shelf_item_dialog.h" #include "chrome/common/pref_member.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/button/native_button.h" #include "chrome/views/view.h" namespace views { diff --git a/chrome/browser/views/options/language_combobox_model.h b/chrome/browser/views/options/language_combobox_model.h index de23de8..e10af90 100644 --- a/chrome/browser/views/options/language_combobox_model.h +++ b/chrome/browser/views/options/language_combobox_model.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_OPTIONS_LANGUAGE_COMBOBOX_MODEL_H__ #include "chrome/browser/profile.h" -#include "chrome/views/combo_box.h" +#include "chrome/views/controls/combo_box.h" /////////////////////////////////////////////////////////////////////////////// // LanguageComboboxModel diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index e0d137a..b156523 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -25,13 +25,13 @@ #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/checkbox.h" -#include "chrome/views/combo_box.h" +#include "chrome/views/controls/button/checkbox.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/button/radio_button.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/tabbed_pane.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/native_button.h" -#include "chrome/views/radio_button.h" -#include "chrome/views/tabbed_pane.h" -#include "chrome/views/text_field.h" #include "chrome/views/widget/widget.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/options/languages_page_view.h b/chrome/browser/views/options/languages_page_view.h index 9623317..a58cb99 100644 --- a/chrome/browser/views/options/languages_page_view.h +++ b/chrome/browser/views/options/languages_page_view.h @@ -7,9 +7,9 @@ #include "chrome/browser/views/options/options_page_view.h" #include "chrome/common/pref_member.h" -#include "chrome/views/combo_box.h" -#include "chrome/views/native_button.h" -#include "chrome/views/table_view.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/table/table_view.h" #include "chrome/views/view.h" namespace views { diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index 19d3887..c666f2a 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -14,8 +14,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/separator.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/separator.h" #include "grit/locale_settings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/options/options_page_view.h b/chrome/browser/views/options/options_page_view.h index ecb403d..6c7c4fd 100644 --- a/chrome/browser/views/options/options_page_view.h +++ b/chrome/browser/views/options/options_page_view.h @@ -8,8 +8,8 @@ #include "chrome/browser/options_window.h" #include "chrome/browser/profile.h" #include "chrome/common/notification_observer.h" -#include "chrome/views/link.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/link.h" +#include "chrome/views/controls/button/native_button.h" class PrefService; diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index bd423ec..f7f492f 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -18,7 +18,7 @@ #include "chrome/personalization/personalization.h" #include "chrome/personalization/views/user_data_page_view.h" #endif -#include "chrome/views/tabbed_pane.h" +#include "chrome/views/controls/tabbed_pane.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index 99a44c3..4a4c53d 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -22,10 +22,10 @@ #include "chrome/common/win_util.h" #include "chrome/views/background.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/image_view.h" -#include "chrome/views/label.h" -#include "chrome/views/native_button.h" -#include "chrome/views/separator.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/image_view.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/separator.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/page_info_window.h b/chrome/browser/views/page_info_window.h index 297b049..e82130f 100644 --- a/chrome/browser/views/page_info_window.h +++ b/chrome/browser/views/page_info_window.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_VIEWS_PAGE_INFO_WINDOW_H__ #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/views/native_button.h" +#include "chrome/views/controls/button/native_button.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/views/password_manager_exceptions_view.cc b/chrome/browser/views/password_manager_exceptions_view.cc index a501a60..5af5f7d 100644 --- a/chrome/browser/views/password_manager_exceptions_view.cc +++ b/chrome/browser/views/password_manager_exceptions_view.cc @@ -2,16 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/views/password_manager_exceptions_view.h" + #include "base/string_util.h" #include "chrome/common/l10n_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/password_manager_exceptions_view.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/background.h" +#include "chrome/views/controls/button/native_button.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/native_button.h" #include "grit/generated_resources.h" using views::ColumnSet; diff --git a/chrome/browser/views/password_manager_exceptions_view.h b/chrome/browser/views/password_manager_exceptions_view.h index 8efc422..cfd9297 100644 --- a/chrome/browser/views/password_manager_exceptions_view.h +++ b/chrome/browser/views/password_manager_exceptions_view.h @@ -11,9 +11,9 @@ #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/views/label.h" -#include "chrome/views/native_button.h" -#include "chrome/views/table_view.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/table/table_view.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/views/password_manager_view.cc b/chrome/browser/views/password_manager_view.cc index 63d8c73..eb7f5eb 100644 --- a/chrome/browser/views/password_manager_view.cc +++ b/chrome/browser/views/password_manager_view.cc @@ -2,16 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/views/password_manager_view.h" + #include "base/string_util.h" #include "chrome/common/l10n_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/password_manager_view.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/background.h" +#include "chrome/views/controls/button/native_button.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/native_button.h" #include "grit/generated_resources.h" using views::ColumnSet; diff --git a/chrome/browser/views/password_manager_view.h b/chrome/browser/views/password_manager_view.h index e382cec..40bb8ba 100644 --- a/chrome/browser/views/password_manager_view.h +++ b/chrome/browser/views/password_manager_view.h @@ -8,12 +8,13 @@ #include <vector> #include "base/scoped_ptr.h" +#include "chrome/browser/profile.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/views/label.h" -#include "chrome/views/native_button.h" -#include "chrome/views/table_view.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/table/table_view.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" #include "webkit/glue/password_form.h" diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc index f190097..583de4c 100644 --- a/chrome/browser/views/repost_form_warning_view.cc +++ b/chrome/browser/views/repost_form_warning_view.cc @@ -8,7 +8,7 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" -#include "chrome/views/message_box_view.h" +#include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc index 199e5e9..42f734d 100644 --- a/chrome/browser/views/restart_message_box.cc +++ b/chrome/browser/views/restart_message_box.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/restart_message_box.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/message_box_view.h" +#include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc index c0b48b4..b10c262 100644 --- a/chrome/browser/views/select_profile_dialog.cc +++ b/chrome/browser/views/select_profile_dialog.cc @@ -12,10 +12,10 @@ #include "chrome/browser/views/new_profile_dialog.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/combo_box.h" +#include "chrome/views/controls/combo_box.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/message_box_view.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/message_box_view.h" #include "chrome/views/view.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/select_profile_dialog.h b/chrome/browser/views/select_profile_dialog.h index dbfb355..a761623 100644 --- a/chrome/browser/views/select_profile_dialog.h +++ b/chrome/browser/views/select_profile_dialog.h @@ -15,7 +15,7 @@ #include "base/ref_counted.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/user_data_manager.h" -#include "chrome/views/combo_box.h" +#include "chrome/views/controls/combo_box.h" #include "chrome/views/window/dialog_delegate.h" class SelectProfileDialogHelper; diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index b243bbd..68050b1 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -17,10 +17,10 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" #include "chrome/views/background.h" +#include "chrome/views/controls/label.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/grid_layout.h" -#include "chrome/views/label.h" -#include "chrome/views/text_field.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/shelf_item_dialog.h b/chrome/browser/views/shelf_item_dialog.h index 8e61493..a90b593 100644 --- a/chrome/browser/views/shelf_item_dialog.h +++ b/chrome/browser/views/shelf_item_dialog.h @@ -7,9 +7,9 @@ #include "chrome/browser/cancelable_request.h" #include "chrome/browser/history/history.h" -#include "chrome/views/native_button.h" -#include "chrome/views/table_view.h" -#include "chrome/views/text_field.h" +#include "chrome/views/controls/button/native_button.h" +#include "chrome/views/controls/table/table_view.h" +#include "chrome/views/controls/text_field.h" #include "chrome/views/view.h" #include "chrome/views/window/dialog_delegate.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index a71ec1c..4117cb0 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -13,7 +13,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/l10n_util_win.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/label.h" +#include "chrome/views/controls/label.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget_win.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/views/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc index 2752250..fb26ad9 100644 --- a/chrome/browser/views/tab_contents_container_view.cc +++ b/chrome/browser/views/tab_contents_container_view.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <algorithm> - #include "chrome/browser/views/tab_contents_container_view.h" +#include <algorithm> + #include "base/logging.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" diff --git a/chrome/browser/views/tab_contents_container_view.h b/chrome/browser/views/tab_contents_container_view.h index 61cf721..7a7ec9d 100644 --- a/chrome/browser/views/tab_contents_container_view.h +++ b/chrome/browser/views/tab_contents_container_view.h @@ -13,8 +13,8 @@ class RenderViewHost; class TabContents; #include "chrome/common/notification_observer.h" +#include "chrome/views/controls/hwnd_view.h" #include "chrome/views/focus/focus_manager.h" -#include "chrome/views/hwnd_view.h" // This View contains the TabContents. // It takes care of linking the TabContents to the browser RootView so that the diff --git a/chrome/browser/views/tab_icon_view.cc b/chrome/browser/views/tab_icon_view.cc index 7a7c972..e9da07e 100644 --- a/chrome/browser/views/tab_icon_view.cc +++ b/chrome/browser/views/tab_icon_view.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/views/tab_icon_view.h" + #include <windows.h> #include <shellapi.h> -#include "chrome/browser/views/tab_icon_view.h" - #include "base/file_util.h" #include "base/path_service.h" #include "chrome/app/chrome_dll_resource.h" diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index 8182843..0557d91 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/browser/views/tabs/dragged_tab_controller.h" + #include <math.h> #include <set> -#include "chrome/browser/views/tabs/dragged_tab_controller.h" - #include "chrome/browser/browser_window.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/metrics/user_metrics.h" diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index 462e248..32d3839 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -9,7 +9,7 @@ #include "chrome/common/gfx/path.h" #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/chrome_menu.h" +#include "chrome/views/controls/menu/chrome_menu.h" #include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/tabs/tab_renderer.h b/chrome/browser/views/tabs/tab_renderer.h index df4cd6c..1a7a5fc 100644 --- a/chrome/browser/views/tabs/tab_renderer.h +++ b/chrome/browser/views/tabs/tab_renderer.h @@ -9,8 +9,8 @@ #include "chrome/common/animation.h" #include "chrome/common/slide_animation.h" #include "chrome/common/throb_animation.h" -#include "chrome/views/image_button.h" -#include "chrome/views/menu.h" +#include "chrome/views/controls/button/image_button.h" +#include "chrome/views/controls/menu/menu.h" #include "chrome/views/view.h" class TabContents; diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 037da49..10021f3 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -23,7 +23,7 @@ #include "chrome/common/slide_animation.h" #include "chrome/common/stl_util-inl.h" #include "chrome/common/win_util.h" -#include "chrome/views/image_view.h" +#include "chrome/views/controls/image_view.h" #include "chrome/views/painter.h" #include "chrome/views/window/non_client_view.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h index 60e641a..38a212b 100644 --- a/chrome/browser/views/tabs/tab_strip.h +++ b/chrome/browser/views/tabs/tab_strip.h @@ -8,8 +8,8 @@ #include "base/gfx/point.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/tabs/tab.h" -#include "chrome/views/image_button.h" -#include "chrome/views/menu.h" +#include "chrome/views/controls/button/image_button.h" +#include "chrome/views/controls/menu/menu.h" #include "chrome/views/view.h" #include "chrome/views/widget/widget_win.h" diff --git a/chrome/browser/views/toolbar_star_toggle.h b/chrome/browser/views/toolbar_star_toggle.h index 8b8d766..efd3bd3 100644 --- a/chrome/browser/views/toolbar_star_toggle.h +++ b/chrome/browser/views/toolbar_star_toggle.h @@ -7,7 +7,7 @@ #include "base/time.h" #include "chrome/browser/views/info_bubble.h" -#include "chrome/views/image_button.h" +#include "chrome/views/controls/button/image_button.h" class BrowserToolbarView; class GURL; diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index 1f80ed1..f676bb7 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -42,9 +42,9 @@ #include "chrome/personalization/personalization.h" #endif #include "chrome/views/background.h" -#include "chrome/views/button_dropdown.h" -#include "chrome/views/hwnd_view.h" -#include "chrome/views/label.h" +#include "chrome/views/controls/button/button_dropdown.h" +#include "chrome/views/controls/hwnd_view.h" +#include "chrome/views/controls/label.h" #include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/window/non_client_view.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/toolbar_view.h b/chrome/browser/views/toolbar_view.h index b1eb0da..10c5506 100644 --- a/chrome/browser/views/toolbar_view.h +++ b/chrome/browser/views/toolbar_view.h @@ -17,10 +17,10 @@ #include "chrome/browser/views/go_button.h" #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/pref_member.h" -#include "chrome/views/menu.h" -#include "chrome/views/menu_button.h" +#include "chrome/views/controls/button/menu_button.h" +#include "chrome/views/controls/menu/menu.h" +#include "chrome/views/controls/menu/view_menu_delegate.h" #include "chrome/views/view.h" -#include "chrome/views/view_menu_delegate.h" class Browser; class Profile; diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc index 3a19a64..f303f37 100644 --- a/chrome/browser/views/user_data_dir_dialog.cc +++ b/chrome/browser/views/user_data_dir_dialog.cc @@ -5,7 +5,7 @@ #include "base/logging.h" #include "chrome/browser/views/user_data_dir_dialog.h" #include "chrome/common/l10n_util.h" -#include "chrome/views/message_box_view.h" +#include "chrome/views/controls/message_box_view.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" |