diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 00:36:12 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-17 00:36:12 +0000 |
| commit | 2a2576e904300c757ca90d129346401c63eacb96 (patch) | |
| tree | b2274a564a900d51eb6a7ed9c99ca9fe91d4af5c /chrome | |
| parent | 5f76da88e6734cda22d39adb0f5e4cca27f07690 (diff) | |
| download | chromium_src-2a2576e904300c757ca90d129346401c63eacb96.zip chromium_src-2a2576e904300c757ca90d129346401c63eacb96.tar.gz chromium_src-2a2576e904300c757ca90d129346401c63eacb96.tar.bz2 | |
Move widget related files into views/widget
TBR=sky
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11811 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
88 files changed, 336 insertions, 201 deletions
diff --git a/chrome/browser/automation/automation_window_tracker.h b/chrome/browser/automation/automation_window_tracker.h index d5f0a90..decaabb4 100644 --- a/chrome/browser/automation/automation_window_tracker.h +++ b/chrome/browser/automation/automation_window_tracker.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_AUTOMATION_AUTOMATION_WINDOW_TRACKER_H__ #include "chrome/browser/automation/automation_resource_tracker.h" -#include "chrome/views/hwnd_notification_source.h" +#include "chrome/views/widget/hwnd_notification_source.h" class AutomationWindowTracker : public AutomationResourceTracker<HWND> { diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index d2f03ba..e0e4f74 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -85,7 +85,7 @@ #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/version.h" -#include "chrome/views/accelerator_handler.h" +#include "chrome/views/widget/accelerator_handler.h" #include "net/base/net_util.h" #include "net/base/sdch_manager.h" #include "net/base/winsock_init.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index d11ae1d..674f83e 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -34,7 +34,7 @@ #include "chrome/browser/automation/automation_provider_list.h" #include "chrome/browser/icon_manager.h" #include "chrome/browser/printing/print_job_manager.h" -#include "chrome/views/accelerator_handler.h" +#include "chrome/views/widget/accelerator_handler.h" #include "chrome/views/view_storage.h" #elif defined(OS_POSIX) // TODO(port): Remove the temporary scaffolding as we port the above headers. diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc index 03be06c..538ed445 100644 --- a/chrome/browser/external_tab_container.cc +++ b/chrome/browser/external_tab_container.cc @@ -15,7 +15,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/win_util.h" // Included for SetRootViewForHWND. -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" #include "chrome/test/automation/automation_messages.h" static const wchar_t kWindowObjectKey[] = L"ChromeWindowObject"; diff --git a/chrome/browser/external_tab_container.h b/chrome/browser/external_tab_container.h index 30c00ec..6f7bb0b 100644 --- a/chrome/browser/external_tab_container.h +++ b/chrome/browser/external_tab_container.h @@ -17,8 +17,8 @@ #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/views/focus_manager.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" class AutomationProvider; class TabContents; diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index f25cb86..12dc1ba 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -26,7 +26,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" // Included for views::kReflectedMessage - TODO(beng): move this to win_util.h! -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" #include "grit/webkit_resources.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" diff --git a/chrome/browser/tab_contents/web_contents_view_win.cc b/chrome/browser/tab_contents/web_contents_view_win.cc index 1cb9d070..2ae5016 100644 --- a/chrome/browser/tab_contents/web_contents_view_win.cc +++ b/chrome/browser/tab_contents/web_contents_view_win.cc @@ -24,8 +24,8 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/url_constants.h" -#include "chrome/views/root_view.h" #include "chrome/views/view_storage.h" +#include "chrome/views/widget/root_view.h" #include "net/base/net_util.h" #include "webkit/glue/plugins/webplugin_delegate_impl.h" #include "webkit/glue/webdropdata.h" diff --git a/chrome/browser/tab_contents/web_contents_view_win.h b/chrome/browser/tab_contents/web_contents_view_win.h index 1494ed9..e154946 100644 --- a/chrome/browser/tab_contents/web_contents_view_win.h +++ b/chrome/browser/tab_contents/web_contents_view_win.h @@ -8,7 +8,7 @@ #include "base/gfx/size.h" #include "base/scoped_ptr.h" #include "chrome/browser/tab_contents/web_contents_view.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" class SadTabView; struct WebDropData; diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc index d8f578d..290a8a0 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -23,7 +23,7 @@ #include "chrome/views/link.h" #include "chrome/views/menu.h" #include "chrome/views/native_button.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "chrome/views/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc index a614f86..f4de76f 100644 --- a/chrome/browser/views/about_ipc_dialog.cc +++ b/chrome/browser/views/about_ipc_dialog.cc @@ -25,14 +25,14 @@ #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/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" #include "chrome/views/window.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 "chrome/views/hwnd_view.h" -#include "chrome/views/root_view.h" namespace { diff --git a/chrome/browser/views/blocked_popup_container.h b/chrome/browser/views/blocked_popup_container.h index 215246b..829e19a 100644 --- a/chrome/browser/views/blocked_popup_container.h +++ b/chrome/browser/views/blocked_popup_container.h @@ -21,7 +21,7 @@ #include "chrome/views/button.h" #include "chrome/views/menu.h" #include "chrome/views/view.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" class BlockedPopupContainer; class Profile; diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index 5cf84f0..7855ffc 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -33,9 +33,9 @@ #include "chrome/common/win_util.h" #include "chrome/views/chrome_menu.h" #include "chrome/views/menu_button.h" -#include "chrome/views/tooltip_manager.h" #include "chrome/views/view_constants.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/tooltip_manager.h" +#include "chrome/views/widget/widget.h" #include "chrome/views/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index 8701f2c..cb4fe7c 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -30,7 +30,7 @@ #include "chrome/views/label.h" #include "chrome/views/menu_button.h" #include "chrome/views/single_split_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "chrome/views/window.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index c25ba4e..dec54e0 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -19,8 +19,8 @@ #include "chrome/common/win_util.h" #include "chrome/views/menu.h" #include "chrome/views/native_button.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/download_started_animation.cc b/chrome/browser/views/download_started_animation.cc index 0b1ad01..7544eef 100644 --- a/chrome/browser/views/download_started_animation.cc +++ b/chrome/browser/views/download_started_animation.cc @@ -7,7 +7,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" #include "grit/theme_resources.h" // How long to spend moving downwards and fading out after waiting. diff --git a/chrome/browser/views/find_bar_win.cc b/chrome/browser/views/find_bar_win.cc index 354ad1a..c31e714 100644 --- a/chrome/browser/views/find_bar_win.cc +++ b/chrome/browser/views/find_bar_win.cc @@ -16,9 +16,9 @@ #include "chrome/browser/tab_contents/web_contents_view.h" #include "chrome/views/external_focus_tracker.h" #include "chrome/views/native_scroll_bar.h" -#include "chrome/views/root_view.h" #include "chrome/views/view_storage.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget_win.h" // The minimum space between the FindInPage window and the search result. static const int kMinFindWndDistanceFromSelection = 5; diff --git a/chrome/browser/views/find_bar_win.h b/chrome/browser/views/find_bar_win.h index b06a033..ed53212 100644 --- a/chrome/browser/views/find_bar_win.h +++ b/chrome/browser/views/find_bar_win.h @@ -9,7 +9,7 @@ #include "chrome/browser/find_bar.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/common/animation.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" class BrowserView; class FindBarController; diff --git a/chrome/browser/views/frame/browser_root_view.h b/chrome/browser/views/frame/browser_root_view.h index df11de7..9753a17 100644 --- a/chrome/browser/views/frame/browser_root_view.h +++ b/chrome/browser/views/frame/browser_root_view.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_ROOT_VIEW_H -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" class OSExchangeData; class TabStrip; diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 48316ab..0a4d6e3 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -50,11 +50,11 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/hwnd_notification_source.h" #include "chrome/views/native_scroll_bar.h" #include "chrome/views/non_client_view.h" -#include "chrome/views/root_view.h" #include "chrome/views/view.h" +#include "chrome/views/widget/hwnd_notification_source.h" +#include "chrome/views/widget/root_view.h" #include "chrome/views/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 0f6d3d1..99d9d8d 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -14,7 +14,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/image_button.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "chrome/views/window_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc index 5a25bad..2525cfb 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/views/fullscreen_exit_bubble.cc @@ -9,7 +9,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/l10n_util_win.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "grit/generated_resources.h" // FullscreenExitView ---------------------------------------------------------- diff --git a/chrome/browser/views/fullscreen_exit_bubble.h b/chrome/browser/views/fullscreen_exit_bubble.h index 3c950de..146eed8 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.h +++ b/chrome/browser/views/fullscreen_exit_bubble.h @@ -9,7 +9,7 @@ #include "chrome/browser/command_updater.h" #include "chrome/common/slide_animation.h" #include "chrome/views/link.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" // FullscreenExitBubble is responsible for showing a bubble atop the screen in // fullscreen mode, telling users how to exit and providing a click target. diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc index 0d5830b..c18f002 100644 --- a/chrome/browser/views/html_dialog_view.cc +++ b/chrome/browser/views/html_dialog_view.cc @@ -5,7 +5,7 @@ #include "chrome/browser/views/html_dialog_view.h" #include "chrome/browser/browser.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "chrome/views/window.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/views/hwnd_html_view.cc b/chrome/browser/views/hwnd_html_view.cc index 9d28cca..95c98f9 100644 --- a/chrome/browser/views/hwnd_html_view.cc +++ b/chrome/browser/views/hwnd_html_view.cc @@ -8,8 +8,8 @@ #include "chrome/browser/renderer_host/render_widget_host_view_win.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/site_instance.h" -#include "chrome/views/widget.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget.h" +#include "chrome/views/widget/widget_win.h" HWNDHtmlView::~HWNDHtmlView() { if (render_view_host_) { diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 861191a..9638899 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -11,7 +11,7 @@ #include "chrome/common/gfx/path.h" #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "chrome/views/window.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/info_bubble.h b/chrome/browser/views/info_bubble.h index 99d82c6..a837af8 100644 --- a/chrome/browser/views/info_bubble.h +++ b/chrome/browser/views/info_bubble.h @@ -7,7 +7,7 @@ #include "chrome/common/slide_animation.h" #include "chrome/views/view.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" // InfoBubble is used to display an arbitrary view above all other windows. // Think of InfoBubble as a tooltip that allows you to embed an arbitrary view diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index 4c4e621..3131979 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -16,7 +16,7 @@ #include "chrome/views/external_focus_tracker.h" #include "chrome/views/image_view.h" #include "chrome/views/label.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index a19a3ce..61d81c2 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -25,7 +25,7 @@ #include "chrome/views/dialog_delegate.h" #include "chrome/views/grid_layout.h" #include "chrome/views/text_field.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "chrome/views/window.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index d759fc0..1bbc95c 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -26,8 +26,8 @@ #include "chrome/common/win_util.h" #include "chrome/views/background.h" #include "chrome/views/border.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc index 2652ea3..f03afa3 100644 --- a/chrome/browser/views/login_view.cc +++ b/chrome/browser/views/login_view.cc @@ -11,8 +11,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" -#include "chrome/views/root_view.h" #include "chrome/views/text_field.h" +#include "chrome/views/widget/root_view.h" #include "grit/generated_resources.h" namespace views { diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index d3e46b2..fb5ed93 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -38,7 +38,7 @@ #include "chrome/views/combo_box.h" #include "chrome/views/grid_layout.h" #include "chrome/views/scroll_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 05e948b..70f6f36 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -28,7 +28,7 @@ #include "chrome/views/native_button.h" #include "chrome/views/radio_button.h" #include "chrome/views/text_field.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_win.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index 260c8ec..a3a31e9 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -29,7 +29,7 @@ #include "chrome/views/native_button.h" #include "chrome/views/radio_button.h" #include "chrome/views/text_field.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 40d4444..e0d137a 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -32,7 +32,7 @@ #include "chrome/views/radio_button.h" #include "chrome/views/tabbed_pane.h" #include "chrome/views/text_field.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/options/options_page_view.cc b/chrome/browser/views/options/options_page_view.cc index 8680fc5..9011bac 100644 --- a/chrome/browser/views/options/options_page_view.cc +++ b/chrome/browser/views/options/options_page_view.cc @@ -8,7 +8,7 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_service.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" /////////////////////////////////////////////////////////////////////////////// // OptionsPageView diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index 04e24f0..353b52e 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -20,7 +20,7 @@ #endif #include "chrome/views/dialog_delegate.h" #include "chrome/views/tabbed_pane.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "chrome/views/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index eed4742..e9c8876 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -21,7 +21,7 @@ #include "chrome/views/grid_layout.h" #include "chrome/views/label.h" #include "chrome/views/text_field.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index 144e3f1..a71ec1c 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -14,8 +14,8 @@ #include "chrome/common/l10n_util_win.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/label.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget_win.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/status_bubble_views.h b/chrome/browser/views/status_bubble_views.h index e5e565a..613c53e 100644 --- a/chrome/browser/views/status_bubble_views.h +++ b/chrome/browser/views/status_bubble_views.h @@ -7,8 +7,8 @@ #include "base/gfx/rect.h" #include "chrome/browser/status_bubble.h" -#include "chrome/views/widget.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget.h" +#include "chrome/views/widget/widget_win.h" class GURL; diff --git a/chrome/browser/views/tab_contents_container_view.cc b/chrome/browser/views/tab_contents_container_view.cc index 28d6aa5..2752250 100644 --- a/chrome/browser/views/tab_contents_container_view.cc +++ b/chrome/browser/views/tab_contents_container_view.cc @@ -14,8 +14,8 @@ #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/browser/view_ids.h" #include "chrome/common/notification_service.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" using views::FocusTraversable; using views::FocusManager; diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc index 8f0536e..8182843 100644 --- a/chrome/browser/views/tabs/dragged_tab_controller.cc +++ b/chrome/browser/views/tabs/dragged_tab_controller.cc @@ -21,7 +21,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/event.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "grit/theme_resources.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/browser/views/tabs/dragged_tab_view.cc b/chrome/browser/views/tabs/dragged_tab_view.cc index eb3f15a..fa45678 100644 --- a/chrome/browser/views/tabs/dragged_tab_view.cc +++ b/chrome/browser/views/tabs/dragged_tab_view.cc @@ -9,7 +9,7 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" #include "chrome/browser/views/tabs/tab_renderer.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" #include "skia/include/SkShader.h" const int kTransparentAlpha = 200; diff --git a/chrome/browser/views/tabs/hwnd_photobooth.cc b/chrome/browser/views/tabs/hwnd_photobooth.cc index 01e70a7..f77f309 100644 --- a/chrome/browser/views/tabs/hwnd_photobooth.cc +++ b/chrome/browser/views/tabs/hwnd_photobooth.cc @@ -6,7 +6,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/tabs/hwnd_photobooth.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" #include "skia/include/SkBitmap.h" namespace { diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index 3de8cb9..462e248 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -10,8 +10,8 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/chrome_menu.h" -#include "chrome/views/tooltip_manager.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/tooltip_manager.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" const std::string Tab::kTabClassName = "browser/tabs/Tab"; diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index 125bce4..8bfec23 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -16,7 +16,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/win_util.h" #include "chrome/views/non_client_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "chrome/views/window.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h index 7ee81149..60e641a 100644 --- a/chrome/browser/views/tabs/tab_strip.h +++ b/chrome/browser/views/tabs/tab_strip.h @@ -11,7 +11,7 @@ #include "chrome/views/image_button.h" #include "chrome/views/menu.h" #include "chrome/views/view.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" class DraggedTabController; class ScopedMouseCloseWidthCalculator; @@ -331,6 +331,7 @@ class TabStrip : public views::View, bool point_down; // Renders the drop indicator. + // TODO(beng): should be views::Widget. views::WidgetWin* arrow_window; views::ImageView* arrow_view; diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index e0165c6..1aa7b9f 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -46,7 +46,7 @@ #include "chrome/views/hwnd_view.h" #include "chrome/views/label.h" #include "chrome/views/non_client_view.h" -#include "chrome/views/tooltip_manager.h" +#include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc index f6f814d..b45e0ca 100644 --- a/chrome/browser/views/user_data_dir_dialog.cc +++ b/chrome/browser/views/user_data_dir_dialog.cc @@ -6,7 +6,7 @@ #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/widget.h" +#include "chrome/views/widget/widget.h" #include "chrome/views/window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index af0932b2..47e3ef2 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -10,7 +10,7 @@ #include "chrome/browser/tab_contents/web_contents.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" -#include "chrome/views/accelerator_handler.h" +#include "chrome/views/widget/accelerator_handler.h" #include "googleurl/src/gurl.h" namespace ui_test_utils { diff --git a/chrome/views/SConscript b/chrome/views/SConscript index 18771fa..3bb3f66 100644 --- a/chrome/views/SConscript +++ b/chrome/views/SConscript @@ -42,10 +42,6 @@ input_files = ChromeFileList([ ]), 'accelerator.cc', 'accelerator.h', - 'accelerator_handler.cc', - 'accelerator_handler.h', - 'aero_tooltip_manager.cc', - 'aero_tooltip_manager.h', 'app_modal_dialog_delegate.h', 'background.cc', 'background.h', @@ -86,7 +82,6 @@ input_files = ChromeFileList([ 'grid_layout.h', 'group_table_view.cc', 'group_table_view.h', - 'hwnd_notification_source.h', 'hwnd_view.cc', 'hwnd_view.h', 'image_view.cc', @@ -121,10 +116,6 @@ input_files = ChromeFileList([ 'repeat_controller.h', 'resize_corner.cc', 'resize_corner.h', - 'root_view.cc', - 'root_view.h', - 'root_view_drop_target.cc', - 'root_view_drop_target.h', 'scroll_bar.cc', 'scroll_bar.h', 'scroll_view.cc', @@ -143,8 +134,6 @@ input_files = ChromeFileList([ 'text_field.h', 'throbber.cc', 'throbber.h', - 'tooltip_manager.cc', - 'tooltip_manager.h', 'tree_model.h', 'tree_node_iterator.h', 'tree_node_model.h', @@ -157,9 +146,20 @@ input_files = ChromeFileList([ 'view_menu_delegate.h', 'view_storage.cc', 'view_storage.h', - 'widget.h', - 'widget_win.cc', - 'widget_win.h', + 'widget/accelerator_handler.cc', + 'widget/accelerator_handler.h', + 'widget/aero_tooltip_manager.cc', + 'widget/aero_tooltip_manager.h', + 'widget/hwnd_notification_source.h', + 'widget/root_view.cc', + 'widget/root_view.h', + 'widget/root_view_drop_target.cc', + 'widget/root_view_drop_target.h', + 'widget/tooltip_manager.cc', + 'widget/tooltip_manager.h', + 'widget/widget.h', + 'widget/widget_win.cc', + 'widget/widget_win.h', 'window.cc', 'window.h', 'window_delegate.cc', @@ -176,14 +176,14 @@ if not env.Bit('windows'): if env.Bit('windows'): input_files += [ - "root_view_win.cc", "view_win.cc" + "widget/root_view_win.cc", ] if env.Bit('linux'): input_files += [ - "root_view_gtk.cc", "view_gtk.cc" + "widget/root_view_gtk.cc", ] # TODO(port?): Incomplete and undecided Views stuff. These compile but aren't # currently needed, and they break the shared build due to missing symbols @@ -201,21 +201,19 @@ if env.Bit('linux'): # 'layout_manager.cc', # 'painter.cc', # 'repeat_controller.cc', -# 'root_view.cc', # 'scroll_bar.cc', # 'scroll_view.cc', # 'throbber.cc', # 'view.cc', # 'view_storage.cc', +# 'widget/root_view.cc', # ) # TODO(port): Port to Linux. input_files.Remove( 'accelerator.cc', - 'accelerator_handler.cc', 'accessibility/accessible_wrapper.cc', 'accessibility/view_accessibility.cc', - 'aero_tooltip_manager.cc', 'base_button.cc', 'bitmap_scroll_bar.cc', 'button.cc', @@ -242,16 +240,18 @@ if env.Bit('linux'): 'non_client_view.cc', 'radio_button.cc', 'resize_corner.cc', - 'root_view_drop_target.cc', 'separator.cc', 'single_split_view.cc', 'tabbed_pane.cc', 'table_view.cc', 'text_button.cc', 'text_field.cc', - 'tooltip_manager.cc', 'tree_view.cc', - 'widget_win.cc', + 'widget/accelerator_handler.cc', + 'widget/aero_tooltip_manager.cc', + 'widget/root_view_drop_target.cc', + 'widget/tooltip_manager.cc', + 'widget/widget_win.cc', 'window.cc', 'window_delegate.cc', ) @@ -263,7 +263,6 @@ if env.Bit('mac'): 'accelerator_handler.cc', 'accessibility/accessible_wrapper.cc', 'accessibility/view_accessibility.cc', - 'aero_tooltip_manager.cc', 'background.cc', 'base_button.cc', 'bitmap_scroll_bar.cc', @@ -299,8 +298,6 @@ if env.Bit('mac'): 'radio_button.cc', 'repeat_controller.cc', 'resize_corner.cc', - 'root_view.cc', - 'root_view_drop_target.cc', 'scroll_bar.cc', 'scroll_view.cc', 'separator.cc', @@ -310,11 +307,14 @@ if env.Bit('mac'): 'text_button.cc', 'text_field.cc', 'throbber.cc', - 'tooltip_manager.cc', 'tree_view.cc', 'view.cc', 'view_storage.cc', - 'widget_win.cc', + 'widget/aero_tooltip_manager.cc', + 'widget/root_view.cc', + 'widget/root_view_drop_target.cc', + 'widget/tooltip_manager.cc', + 'widget/widget_win.cc', 'window.cc', 'window_delegate.cc', ) diff --git a/chrome/views/accessibility/view_accessibility.cc b/chrome/views/accessibility/view_accessibility.cc index 35ab3e1..5991218 100644 --- a/chrome/views/accessibility/view_accessibility.cc +++ b/chrome/views/accessibility/view_accessibility.cc @@ -5,7 +5,7 @@ #include "chrome/views/accessibility/view_accessibility.h" #include "chrome/views/accessibility/accessible_wrapper.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" HRESULT ViewAccessibility::Initialize(views::View* view) { if (!view) { diff --git a/chrome/views/bitmap_scroll_bar.cc b/chrome/views/bitmap_scroll_bar.cc index 32080a6..f96a9e8 100644 --- a/chrome/views/bitmap_scroll_bar.cc +++ b/chrome/views/bitmap_scroll_bar.cc @@ -9,7 +9,7 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/menu.h" #include "chrome/views/scroll_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "skia/include/SkBitmap.h" diff --git a/chrome/views/button_dropdown.cc b/chrome/views/button_dropdown.cc index 9d30561..d9b7e0c 100644 --- a/chrome/views/button_dropdown.cc +++ b/chrome/views/button_dropdown.cc @@ -8,7 +8,7 @@ #include "chrome/browser/back_forward_menu_model.h" #include "chrome/common/l10n_util.h" #include "chrome/views/view_menu_delegate.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" namespace views { diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc index c8df05e..5ce9dcd 100644 --- a/chrome/views/chrome_menu.cc +++ b/chrome/views/chrome_menu.cc @@ -20,9 +20,9 @@ #include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/border.h" -#include "chrome/views/root_view.h" #include "chrome/views/view_constants.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget_win.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" diff --git a/chrome/views/focus_manager.cc b/chrome/views/focus_manager.cc index 8924f5e..1af79a6 100644 --- a/chrome/views/focus_manager.cc +++ b/chrome/views/focus_manager.cc @@ -11,10 +11,10 @@ #include "chrome/common/notification_service.h" #include "chrome/views/accelerator.h" #include "chrome/views/focus_manager.h" -#include "chrome/views/root_view.h" #include "chrome/views/view.h" #include "chrome/views/view_storage.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" // The following keys are used in SetProp/GetProp to associate additional // information needed for focus tracking with a window. diff --git a/chrome/views/focus_manager_unittest.cc b/chrome/views/focus_manager_unittest.cc index 736fcbe..b08e19a 100644 --- a/chrome/views/focus_manager_unittest.cc +++ b/chrome/views/focus_manager_unittest.cc @@ -10,7 +10,6 @@ #include "base/gfx/rect.h" #include "chrome/common/resource_bundle.h" -#include "chrome/views/accelerator_handler.h" #include "chrome/views/background.h" #include "chrome/views/border.h" #include "chrome/views/checkbox.h" @@ -18,11 +17,12 @@ #include "chrome/views/link.h" #include "chrome/views/native_button.h" #include "chrome/views/radio_button.h" -#include "chrome/views/root_view.h" #include "chrome/views/scroll_view.h" #include "chrome/views/tabbed_pane.h" #include "chrome/views/text_field.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/accelerator_handler.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget_win.h" #include "chrome/views/window.h" #include "chrome/views/window_delegate.h" #include "SkColor.h" diff --git a/chrome/views/hwnd_view.cc b/chrome/views/hwnd_view.cc index a89e5f9..43e6c89 100644 --- a/chrome/views/hwnd_view.cc +++ b/chrome/views/hwnd_view.cc @@ -8,7 +8,7 @@ #include "chrome/common/win_util.h" #include "chrome/views/focus_manager.h" #include "chrome/views/scroll_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "base/logging.h" namespace views { diff --git a/chrome/views/menu_button.cc b/chrome/views/menu_button.cc index 21cc828..89d1f15 100644 --- a/chrome/views/menu_button.cc +++ b/chrome/views/menu_button.cc @@ -14,9 +14,9 @@ #include "chrome/common/win_util.h" #include "chrome/views/button.h" #include "chrome/views/event.h" -#include "chrome/views/root_view.h" #include "chrome/views/view_menu_delegate.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/views/native_control.cc b/chrome/views/native_control.cc index ba7bc5d..d50f500 100644 --- a/chrome/views/native_control.cc +++ b/chrome/views/native_control.cc @@ -17,7 +17,7 @@ #include "chrome/views/border.h" #include "chrome/views/focus_manager.h" #include "chrome/views/hwnd_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "base/gfx/native_theme.h" namespace views { diff --git a/chrome/views/native_scroll_bar.cc b/chrome/views/native_scroll_bar.cc index c789130..60ee31c 100644 --- a/chrome/views/native_scroll_bar.cc +++ b/chrome/views/native_scroll_bar.cc @@ -12,7 +12,7 @@ #include "base/message_loop.h" #include "chrome/views/hwnd_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" namespace views { diff --git a/chrome/views/non_client_view.cc b/chrome/views/non_client_view.cc index 984d5e9..c234f23 100644 --- a/chrome/views/non_client_view.cc +++ b/chrome/views/non_client_view.cc @@ -5,8 +5,8 @@ #include "chrome/views/non_client_view.h" #include "chrome/common/win_util.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" #include "chrome/views/window.h" namespace views { diff --git a/chrome/views/radio_button.cc b/chrome/views/radio_button.cc index fb8695a..a376460 100644 --- a/chrome/views/radio_button.cc +++ b/chrome/views/radio_button.cc @@ -6,7 +6,7 @@ #include "chrome/views/label.h" #include "chrome/views/hwnd_view.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" namespace views { diff --git a/chrome/views/scroll_view.cc b/chrome/views/scroll_view.cc index 3331bc1..1d2a8de 100644 --- a/chrome/views/scroll_view.cc +++ b/chrome/views/scroll_view.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/native_scroll_bar.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "grit/theme_resources.h" namespace views { diff --git a/chrome/views/tabbed_pane.cc b/chrome/views/tabbed_pane.cc index 1663390..e43fd12 100644 --- a/chrome/views/tabbed_pane.cc +++ b/chrome/views/tabbed_pane.cc @@ -15,8 +15,8 @@ #include "chrome/common/stl_util-inl.h" #include "chrome/common/throb_animation.h" #include "chrome/views/background.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget_win.h" #include "skia/ext/skia_utils_win.h" #include "skia/include/SkColor.h" diff --git a/chrome/views/text_field.cc b/chrome/views/text_field.cc index 1c62b14..82e8692 100644 --- a/chrome/views/text_field.cc +++ b/chrome/views/text_field.cc @@ -24,7 +24,7 @@ #include "chrome/common/win_util.h" #include "chrome/views/hwnd_view.h" #include "chrome/views/menu.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_win.h" diff --git a/chrome/views/tree_view.cc b/chrome/views/tree_view.cc index 764d6c7..d476611 100644 --- a/chrome/views/tree_view.cc +++ b/chrome/views/tree_view.cc @@ -13,7 +13,7 @@ #include "chrome/common/resource_bundle.h" #include "chrome/common/stl_util-inl.h" #include "chrome/views/focus_manager.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" #include "grit/theme_resources.h" namespace views { diff --git a/chrome/views/view.cc b/chrome/views/view.cc index 5b5af2e..7cd6ad9 100644 --- a/chrome/views/view.cc +++ b/chrome/views/view.cc @@ -19,10 +19,10 @@ #include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/layout_manager.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" #if defined(OS_WIN) -#include "chrome/views/tooltip_manager.h" +#include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/accessibility/accessible_wrapper.h" #endif #include "SkShader.h" diff --git a/chrome/views/view_unittest.cc b/chrome/views/view_unittest.cc index bbb7616..7da9f42 100644 --- a/chrome/views/view_unittest.cc +++ b/chrome/views/view_unittest.cc @@ -10,9 +10,9 @@ #include "chrome/views/checkbox.h" #include "chrome/views/dialog_delegate.h" #include "chrome/views/event.h" -#include "chrome/views/root_view.h" #include "chrome/views/view.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget_win.h" #include "chrome/views/window.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/views/view_win.cc b/chrome/views/view_win.cc index 1e5da1d..4883572 100644 --- a/chrome/views/view_win.cc +++ b/chrome/views/view_win.cc @@ -12,8 +12,8 @@ #include "chrome/common/os_exchange_data.h" #include "chrome/views/accessibility/accessible_wrapper.h" #include "chrome/views/border.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" namespace views { diff --git a/chrome/views/views.vcproj b/chrome/views/views.vcproj index 01f8da5..890347a 100644 --- a/chrome/views/views.vcproj +++ b/chrome/views/views.vcproj @@ -122,7 +122,7 @@ </References> <Files> <Filter - Name="Accessibility" + Name="accessibility" > <File RelativePath=".\accessibility\accessible_wrapper.cc" @@ -141,6 +141,196 @@ > </File> </Filter> + <Filter + Name="widget" + > + <File + RelativePath=".\widget\accelerator_handler.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\widget\accelerator_handler.h" + > + </File> + <File + RelativePath=".\widget\aero_tooltip_manager.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\widget\aero_tooltip_manager.h" + > + </File> + <File + RelativePath=".\widget\hwnd_notification_source.h" + > + </File> + <File + RelativePath=".\widget\root_view.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\widget\root_view.h" + > + </File> + <File + RelativePath=".\widget\root_view_drop_target.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\widget\root_view_drop_target.h" + > + </File> + <File + RelativePath=".\widget\root_view_win.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\widget\tooltip_manager.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\widget\tooltip_manager.h" + > + </File> + <File + RelativePath=".\widget\widget.h" + > + </File> + <File + RelativePath=".\widget\widget_win.cc" + > + <FileConfiguration + Name="Debug|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32" + > + <Tool + Name="VCCLCompilerTool" + ObjectFile="$(IntDir)\$(InputName)1.obj" + XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc" + /> + </FileConfiguration> + </File> + <File + RelativePath=".\widget\widget_win.h" + > + </File> + </Filter> <File RelativePath=".\accelerator.cc" > @@ -150,22 +340,6 @@ > </File> <File - RelativePath=".\accelerator_handler.cc" - > - </File> - <File - RelativePath=".\accelerator_handler.h" - > - </File> - <File - RelativePath=".\aero_tooltip_manager.cc" - > - </File> - <File - RelativePath=".\aero_tooltip_manager.h" - > - </File> - <File RelativePath=".\app_modal_dialog_delegate.h" > </File> @@ -482,26 +656,6 @@ > </File> <File - RelativePath=".\root_view.cc" - > - </File> - <File - RelativePath=".\root_view.h" - > - </File> - <File - RelativePath=".\root_view_drop_target.cc" - > - </File> - <File - RelativePath=".\root_view_drop_target.h" - > - </File> - <File - RelativePath=".\root_view_win.cc" - > - </File> - <File RelativePath=".\scroll_bar.cc" > </File> @@ -574,14 +728,6 @@ > </File> <File - RelativePath=".\tooltip_manager.cc" - > - </File> - <File - RelativePath=".\tooltip_manager.h" - > - </File> - <File RelativePath=".\tree_model.h" > </File> @@ -634,18 +780,6 @@ > </File> <File - RelativePath=".\widget.h" - > - </File> - <File - RelativePath=".\widget_win.cc" - > - </File> - <File - RelativePath=".\widget_win.h" - > - </File> - <File RelativePath=".\window.h" > </File> diff --git a/chrome/views/accelerator_handler.cc b/chrome/views/widget/accelerator_handler.cc index 94adc57..847a311 100644 --- a/chrome/views/accelerator_handler.cc +++ b/chrome/views/widget/accelerator_handler.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/accelerator_handler.h" +#include "chrome/views/widget/accelerator_handler.h" #include "chrome/views/focus_manager.h" diff --git a/chrome/views/accelerator_handler.h b/chrome/views/widget/accelerator_handler.h index f71be26..f71be26 100644 --- a/chrome/views/accelerator_handler.h +++ b/chrome/views/widget/accelerator_handler.h diff --git a/chrome/views/aero_tooltip_manager.cc b/chrome/views/widget/aero_tooltip_manager.cc index f412d6b..bd6404d 100644 --- a/chrome/views/aero_tooltip_manager.cc +++ b/chrome/views/widget/aero_tooltip_manager.cc @@ -8,7 +8,7 @@ #include <commctrl.h> #include <shlobj.h> -#include "chrome/views/aero_tooltip_manager.h" +#include "chrome/views/widget/aero_tooltip_manager.h" #include "base/message_loop.h" #include "chrome/common/l10n_util_win.h" diff --git a/chrome/views/aero_tooltip_manager.h b/chrome/views/widget/aero_tooltip_manager.h index 43d5423..17fab05 100644 --- a/chrome/views/aero_tooltip_manager.h +++ b/chrome/views/widget/aero_tooltip_manager.h @@ -7,7 +7,7 @@ #include "base/ref_counted.h" #include "base/task.h" -#include "chrome/views/tooltip_manager.h" +#include "chrome/views/widget/tooltip_manager.h" namespace views { diff --git a/chrome/views/hwnd_notification_source.h b/chrome/views/widget/hwnd_notification_source.h index 38874e4..9f33c2b 100644 --- a/chrome/views/hwnd_notification_source.h +++ b/chrome/views/widget/hwnd_notification_source.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_VIEWS_HWND_NOTIFICATION_SOURCE_H__ -#define CHROME_VIEWS_HWND_NOTIFICATION_SOURCE_H__ +#ifndef CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__ +#define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__ #include "chrome/common/notification_source.h" @@ -21,4 +21,4 @@ class Source<HWND> : public NotificationSource { HWND ptr() const { return static_cast<HWND>(ptr_); } }; -#endif // #define CHROME_VIEWS_HWND_NOTIFICATION_SOURCE_H__ +#endif // #define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__ diff --git a/chrome/views/root_view.cc b/chrome/views/widget/root_view.cc index 861d3c9..672a210 100644 --- a/chrome/views/root_view.cc +++ b/chrome/views/widget/root_view.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include <algorithm> @@ -15,9 +15,9 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #if defined(OS_WIN) -#include "chrome/views/root_view_drop_target.h" +#include "chrome/views/widget/root_view_drop_target.h" #endif -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" namespace views { diff --git a/chrome/views/root_view.h b/chrome/views/widget/root_view.h index 57ea710..57ea710 100644 --- a/chrome/views/root_view.h +++ b/chrome/views/widget/root_view.h diff --git a/chrome/views/root_view_drop_target.cc b/chrome/views/widget/root_view_drop_target.cc index ee9a365..60324c5 100644 --- a/chrome/views/root_view_drop_target.cc +++ b/chrome/views/widget/root_view_drop_target.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/root_view_drop_target.h" +#include "chrome/views/widget/root_view_drop_target.h" #include "base/gfx/point.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/views/root_view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/widget.h" namespace views { diff --git a/chrome/views/root_view_drop_target.h b/chrome/views/widget/root_view_drop_target.h index 72a5a87..72a5a87 100644 --- a/chrome/views/root_view_drop_target.h +++ b/chrome/views/widget/root_view_drop_target.h diff --git a/chrome/views/root_view_gtk.cc b/chrome/views/widget/root_view_gtk.cc index 2c21016..89ed51a6 100644 --- a/chrome/views/root_view_gtk.cc +++ b/chrome/views/widget/root_view_gtk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "base/logging.h" diff --git a/chrome/views/root_view_win.cc b/chrome/views/widget/root_view_win.cc index 8ea6444..b4641b4 100644 --- a/chrome/views/root_view_win.cc +++ b/chrome/views/widget/root_view_win.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "base/base_drag_source.h" #include "base/logging.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/drag_drop_types.h" -#include "chrome/views/root_view_drop_target.h" +#include "chrome/views/widget/root_view_drop_target.h" namespace views { diff --git a/chrome/views/tooltip_manager.cc b/chrome/views/widget/tooltip_manager.cc index 5a38c53..200b8da 100644 --- a/chrome/views/tooltip_manager.cc +++ b/chrome/views/widget/tooltip_manager.cc @@ -11,10 +11,10 @@ #include "chrome/common/l10n_util_win.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/win_util.h" -#include "chrome/views/root_view.h" -#include "chrome/views/tooltip_manager.h" #include "chrome/views/view.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/root_view.h" +#include "chrome/views/widget/tooltip_manager.h" +#include "chrome/views/widget/widget.h" namespace views { diff --git a/chrome/views/tooltip_manager.h b/chrome/views/widget/tooltip_manager.h index 2800fb0..2800fb0 100644 --- a/chrome/views/tooltip_manager.h +++ b/chrome/views/widget/tooltip_manager.h diff --git a/chrome/views/widget.h b/chrome/views/widget/widget.h index 46aa754..46aa754 100644 --- a/chrome/views/widget.h +++ b/chrome/views/widget/widget.h diff --git a/chrome/views/widget_win.cc b/chrome/views/widget/widget_win.cc index e5a8891..047313d 100644 --- a/chrome/views/widget_win.cc +++ b/chrome/views/widget/widget_win.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" @@ -11,10 +11,10 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/notification_service.h" #include "chrome/common/win_util.h" -#include "chrome/views/aero_tooltip_manager.h" #include "chrome/views/accessibility/view_accessibility.h" -#include "chrome/views/hwnd_notification_source.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/aero_tooltip_manager.h" +#include "chrome/views/widget/hwnd_notification_source.h" +#include "chrome/views/widget/root_view.h" namespace views { diff --git a/chrome/views/widget_win.h b/chrome/views/widget/widget_win.h index f13051c..d5d5bad 100644 --- a/chrome/views/widget_win.h +++ b/chrome/views/widget/widget_win.h @@ -12,7 +12,7 @@ #include "base/system_monitor.h" #include "chrome/views/focus_manager.h" #include "chrome/views/layout_manager.h" -#include "chrome/views/widget.h" +#include "chrome/views/widget/widget.h" class ChromeCanvas; diff --git a/chrome/views/window_win.cc b/chrome/views/window_win.cc index e2226d7..fda6eb7 100644 --- a/chrome/views/window_win.cc +++ b/chrome/views/window_win.cc @@ -21,7 +21,7 @@ #include "chrome/views/custom_frame_view.h" #include "chrome/views/native_frame_view.h" #include "chrome/views/non_client_view.h" -#include "chrome/views/root_view.h" +#include "chrome/views/widget/root_view.h" #include "chrome/views/window_delegate.h" #include "grit/generated_resources.h" diff --git a/chrome/views/window_win.h b/chrome/views/window_win.h index bd6f5ac..7b27ee0 100644 --- a/chrome/views/window_win.h +++ b/chrome/views/window_win.h @@ -8,7 +8,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/views/client_view.h" #include "chrome/views/non_client_view.h" -#include "chrome/views/widget_win.h" +#include "chrome/views/widget/widget_win.h" #include "chrome/views/window.h" namespace gfx { |