summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views')
-rw-r--r--chrome/browser/views/about_ipc_dialog.cc6
-rw-r--r--chrome/browser/views/blocked_popup_container.h2
-rw-r--r--chrome/browser/views/bookmark_bar_view.cc4
-rw-r--r--chrome/browser/views/bookmark_manager_view.cc2
-rw-r--r--chrome/browser/views/download_item_view.cc4
-rw-r--r--chrome/browser/views/download_started_animation.cc2
-rw-r--r--chrome/browser/views/find_bar_win.cc4
-rw-r--r--chrome/browser/views/find_bar_win.h2
-rw-r--r--chrome/browser/views/frame/browser_root_view.h2
-rw-r--r--chrome/browser/views/frame/browser_view.cc4
-rw-r--r--chrome/browser/views/frame/opaque_browser_frame_view.cc2
-rw-r--r--chrome/browser/views/fullscreen_exit_bubble.cc2
-rw-r--r--chrome/browser/views/fullscreen_exit_bubble.h2
-rw-r--r--chrome/browser/views/html_dialog_view.cc2
-rw-r--r--chrome/browser/views/hwnd_html_view.cc4
-rw-r--r--chrome/browser/views/info_bubble.cc2
-rw-r--r--chrome/browser/views/info_bubble.h2
-rw-r--r--chrome/browser/views/infobars/infobars.cc2
-rw-r--r--chrome/browser/views/keyword_editor_view.cc2
-rw-r--r--chrome/browser/views/location_bar_view.cc4
-rw-r--r--chrome/browser/views/login_view.cc2
-rw-r--r--chrome/browser/views/options/advanced_contents_view.cc2
-rw-r--r--chrome/browser/views/options/content_page_view.cc2
-rw-r--r--chrome/browser/views/options/fonts_page_view.cc2
-rw-r--r--chrome/browser/views/options/languages_page_view.cc2
-rw-r--r--chrome/browser/views/options/options_page_view.cc2
-rw-r--r--chrome/browser/views/options/options_window_view.cc2
-rw-r--r--chrome/browser/views/shelf_item_dialog.cc2
-rw-r--r--chrome/browser/views/status_bubble_views.cc4
-rw-r--r--chrome/browser/views/status_bubble_views.h4
-rw-r--r--chrome/browser/views/tab_contents_container_view.cc4
-rw-r--r--chrome/browser/views/tabs/dragged_tab_controller.cc2
-rw-r--r--chrome/browser/views/tabs/dragged_tab_view.cc2
-rw-r--r--chrome/browser/views/tabs/hwnd_photobooth.cc2
-rw-r--r--chrome/browser/views/tabs/tab.cc4
-rw-r--r--chrome/browser/views/tabs/tab_renderer.cc2
-rw-r--r--chrome/browser/views/tabs/tab_strip.h3
-rw-r--r--chrome/browser/views/toolbar_view.cc2
-rw-r--r--chrome/browser/views/user_data_dir_dialog.cc2
39 files changed, 52 insertions, 51 deletions
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"