diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 16:09:33 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 16:09:33 +0000 |
| commit | 45647af87d1e7e5ed607c6fd82a1ac32a708a725 (patch) | |
| tree | 258381d5b333c5749616d97c1fe3a6bc4db50e1d | |
| parent | ab91de22a8a7eef73958b0b4463de89bd7fdbd12 (diff) | |
| download | chromium_src-45647af87d1e7e5ed607c6fd82a1ac32a708a725.zip chromium_src-45647af87d1e7e5ed607c6fd82a1ac32a708a725.tar.gz chromium_src-45647af87d1e7e5ed607c6fd82a1ac32a708a725.tar.bz2 | |
views: Move the remaining file from views/ to ui/views/.
BUG=104039
R=ben@chromium.org
TBR=stevenjb@chromium.org
Review URL: http://codereview.chromium.org/8771006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112469 0039d316-1c4b-4281-b951-d872f2087c98
154 files changed, 230 insertions, 229 deletions
diff --git a/chrome/browser/bookmarks/bookmark_drop_info.cc b/chrome/browser/bookmarks/bookmark_drop_info.cc index 7c708ef..0dfd46e 100644 --- a/chrome/browser/bookmarks/bookmark_drop_info.cc +++ b/chrome/browser/bookmarks/bookmark_drop_info.cc @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "ui/views/events/event.h" -#include "views/view_constants.h" +#include "ui/views/view_constants.h" BookmarkDropInfo::BookmarkDropInfo(gfx::NativeWindow wnd, int top_margin) : source_operations_(0), diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc index a410341..7717974 100644 --- a/chrome/browser/chromeos/frame/panel_controller.cc +++ b/chrome/browser/chromeos/frame/panel_controller.cc @@ -32,9 +32,9 @@ #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/events/event.h" +#include "ui/views/painter.h" #include "ui/views/view.h" #include "ui/views/widget/widget.h" -#include "views/painter.h" #if defined(TOOLKIT_USES_GTK) #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h" diff --git a/chrome/browser/chromeos/login/captcha_view.cc b/chrome/browser/chromeos/login/captcha_view.cc index cf2a3ff..adbe72b 100644 --- a/chrome/browser/chromeos/login/captcha_view.cc +++ b/chrome/browser/chromeos/login/captcha_view.cc @@ -15,6 +15,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/background.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" @@ -22,7 +23,6 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" -#include "views/background.h" using views::Label; using views::Textfield; diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index 5046afd..815f6ff 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -20,8 +20,8 @@ #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/throbber.h" +#include "ui/views/painter.h" #include "ui/views/widget/widget.h" -#include "views/painter.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/rounded_rect_painter.cc b/chrome/browser/chromeos/login/rounded_rect_painter.cc index cb2d4b7..2a1719d 100644 --- a/chrome/browser/chromeos/login/rounded_rect_painter.cc +++ b/chrome/browser/chromeos/login/rounded_rect_painter.cc @@ -9,8 +9,8 @@ #include "third_party/skia/include/effects/SkBlurMaskFilter.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/gfx/canvas_skia.h" -#include "views/border.h" -#include "views/painter.h" +#include "ui/views/border.h" +#include "ui/views/painter.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc index 9eafac4..015bd99 100644 --- a/chrome/browser/chromeos/login/screen_lock_view.cc +++ b/chrome/browser/chromeos/login/screen_lock_view.cc @@ -19,13 +19,13 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/native_textfield_wrapper.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/layout/grid_layout.h" -#include "views/background.h" -#include "views/border.h" #if defined(TOOLKIT_USES_GTK) #include "ui/views/widget/native_widget_gtk.h" diff --git a/chrome/browser/chromeos/login/shutdown_button.cc b/chrome/browser/chromeos/login/shutdown_button.cc index d654b4f..20dc1b2 100644 --- a/chrome/browser/chromeos/login/shutdown_button.cc +++ b/chrome/browser/chromeos/login/shutdown_button.cc @@ -15,7 +15,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/gtk_util.h" -#include "views/background.h" +#include "ui/views/background.h" namespace { diff --git a/chrome/browser/chromeos/login/take_photo_view.cc b/chrome/browser/chromeos/login/take_photo_view.cc index bae66e1..db761fe 100644 --- a/chrome/browser/chromeos/login/take_photo_view.cc +++ b/chrome/browser/chromeos/login/take_photo_view.cc @@ -12,13 +12,13 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/throbber.h" #include "ui/views/layout/grid_layout.h" -#include "views/background.h" -#include "views/border.h" namespace { diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc index 268b031..43df394 100644 --- a/chrome/browser/chromeos/login/user_view.cc +++ b/chrome/browser/chromeos/login/user_view.cc @@ -18,12 +18,12 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/gtk_util.h" #include "ui/gfx/rect.h" +#include "ui/views/background.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" #include "ui/views/controls/link_listener.h" -#include "views/background.h" namespace { diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index 24f2fe8..81f386e 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -23,10 +23,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/controls/label.h" #include "ui/views/controls/throbber.h" -#include "views/background.h" -#include "views/border.h" using base::TimeDelta; using views::Label; diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index 646a2c8..b67612d9 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -30,6 +30,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/background.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" @@ -39,7 +40,6 @@ #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/widget/widget.h" -#include "views/background.h" namespace { // Menu commands diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index 4803711..49d6a01 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -19,10 +19,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/background.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/controls/scroll_view.h" #include "ui/views/widget/native_widget_gtk.h" -#include "views/background.h" #define SET_STATE(state) SetState(state, __PRETTY_FUNCTION__) diff --git a/chrome/browser/chromeos/status/status_area_button.cc b/chrome/browser/chromeos/status/status_area_button.cc index 3701d07..d9fa106 100644 --- a/chrome/browser/chromeos/status/status_area_button.cc +++ b/chrome/browser/chromeos/status/status_area_button.cc @@ -8,8 +8,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/skbitmap_operations.h" +#include "ui/views/border.h" #include "ui/views/view.h" -#include "views/border.h" namespace { diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc index c326ad48..55355b2 100644 --- a/chrome/browser/chromeos/status/status_area_view.cc +++ b/chrome/browser/chromeos/status/status_area_view.cc @@ -11,7 +11,7 @@ #include "base/message_loop.h" #include "chrome/browser/chromeos/view_ids.h" #include "ui/gfx/canvas.h" -#include "views/border.h" +#include "ui/views/border.h" // Number of pixels to separate each icon. #if defined(TOUCH_UI) diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h index 22ecbfb..a243652 100644 --- a/chrome/browser/chromeos/status/status_area_view.h +++ b/chrome/browser/chromeos/status/status_area_view.h @@ -11,8 +11,8 @@ #include "base/basictypes.h" #include "base/callback.h" #include "chrome/browser/chromeos/status/status_area_button.h" +#include "ui/views/accessible_pane_view.h" #include "ui/views/view.h" -#include "views/accessible_pane_view.h" // This class is used to wrap the small informative widgets in the upper-right // of the window title bar. It is used on ChromeOS only. diff --git a/chrome/browser/chromeos/views/copy_background.cc b/chrome/browser/chromeos/views/copy_background.cc index a6dd3ed..9116e1b 100644 --- a/chrome/browser/chromeos/views/copy_background.cc +++ b/chrome/browser/chromeos/views/copy_background.cc @@ -6,8 +6,8 @@ #include "base/logging.h" #include "ui/gfx/canvas.h" +#include "ui/views/background.h" #include "ui/views/view.h" -#include "views/background.h" namespace chromeos { diff --git a/chrome/browser/chromeos/views/copy_background.h b/chrome/browser/chromeos/views/copy_background.h index 6f69735..7f03283 100644 --- a/chrome/browser/chromeos/views/copy_background.h +++ b/chrome/browser/chromeos/views/copy_background.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "views/background.h" +#include "ui/views/background.h" namespace views { class View; diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc index a8bfc15..5359696 100644 --- a/chrome/browser/extensions/extension_input_api.cc +++ b/chrome/browser/extensions/extension_input_api.cc @@ -16,8 +16,8 @@ #include "chrome/common/chrome_notification_types.h" #include "ui/views/events/event.h" #include "ui/views/ime/input_method.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" #if defined(USE_VIRTUAL_KEYBOARD) #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/panels/panel_browser_frame_view.cc b/chrome/browser/ui/panels/panel_browser_frame_view.cc index 2ebdb64..e824b17 100644 --- a/chrome/browser/ui/panels/panel_browser_frame_view.cc +++ b/chrome/browser/ui/panels/panel_browser_frame_view.cc @@ -35,8 +35,8 @@ #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" +#include "ui/views/painter.h" #include "ui/views/widget/widget_delegate.h" -#include "views/painter.h" namespace { diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index fe8c614..bf629b5 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -40,8 +40,8 @@ #include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/throbber.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/view_text_utils.h" #include "ui/views/widget/widget.h" -#include "views/view_text_utils.h" #include "webkit/glue/webkit_glue.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc index 102b007..1f5dbba 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -16,11 +16,11 @@ #include "testing/gtest/include/gtest/gtest.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/layout/grid_layout.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" #include "ui/views/widget/widget_delegate.h" -#include "views/views_delegate.h" #if defined(TOOLKIT_VIEWS) diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc index becb12d..bd9ba7c 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -34,9 +34,9 @@ #include "ui/views/controls/label.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/painter.h" #include "ui/views/widget/widget.h" #include "unicode/ubidi.h" -#include "views/painter.h" #if defined(OS_WIN) #include "base/win/scoped_gdi_object.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc index ae5dacd..c351fb2 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc @@ -58,9 +58,9 @@ #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/drag_utils.h" #include "ui/views/metrics.h" +#include "ui/views/view_constants.h" #include "ui/views/widget/tooltip_manager.h" #include "ui/views/widget/widget.h" -#include "views/view_constants.h" using views::CustomButton; using views::DropTargetEvent; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 03e4205..ddd62370 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -33,8 +33,8 @@ #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/submenu_view.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" using content::BrowserThread; diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index 08ec059..fe3d337 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -23,6 +23,7 @@ #include "grit/locale_settings.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/views/background.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/label.h" #include "ui/views/controls/menu/menu_2.h" @@ -31,7 +32,6 @@ #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" -#include "views/background.h" using views::GridLayout; diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h index bad2b70..71c5dc1 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.h +++ b/chrome/browser/ui/views/chrome_views_delegate.h @@ -10,7 +10,7 @@ #include "base/compiler_specific.h" #include "build/build_config.h" #include "ui/base/accessibility/accessibility_types.h" -#include "views/views_delegate.h" +#include "ui/views/views_delegate.h" class ChromeViewsDelegate : public views::ViewsDelegate { public: diff --git a/chrome/browser/ui/views/constrained_window_views.cc b/chrome/browser/ui/views/constrained_window_views.cc index 06eeddb..c864452 100644 --- a/chrome/browser/ui/views/constrained_window_views.cc +++ b/chrome/browser/ui/views/constrained_window_views.cc @@ -33,12 +33,12 @@ #include "ui/gfx/rect.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" #include "ui/views/window/client_view.h" #include "ui/views/window/non_client_view.h" #include "ui/views/window/window_resources.h" #include "ui/views/window/window_shape.h" -#include "views/views_delegate.h" #if defined(OS_WIN) && !defined(USE_AURA) #include "ui/views/widget/native_widget_win.h" diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc index d83aaf5..53b08bc 100644 --- a/chrome/browser/ui/views/cookie_info_view.cc +++ b/chrome/browser/ui/views/cookie_info_view.cc @@ -17,13 +17,13 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" +#include "ui/views/border.h" #include "ui/views/controls/combobox/combobox.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/controls/tree/tree_view.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" -#include "views/border.h" static const int kCookieInfoViewBorderSize = 1; static const int kCookieInfoViewInsetSize = 3; diff --git a/chrome/browser/ui/views/detachable_toolbar_view.h b/chrome/browser/ui/views/detachable_toolbar_view.h index e232134..9def691 100644 --- a/chrome/browser/ui/views/detachable_toolbar_view.h +++ b/chrome/browser/ui/views/detachable_toolbar_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_DETACHABLE_TOOLBAR_VIEW_H_ #pragma once -#include "views/accessible_pane_view.h" +#include "ui/views/accessible_pane_view.h" struct SkRect; diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc index 159e739..630d1e9 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc @@ -19,10 +19,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" +#include "ui/views/border.h" #include "ui/views/controls/label.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/widget/widget.h" -#include "views/border.h" DownloadInProgressDialogView::DownloadInProgressDialogView(Browser* browser) : browser_(browser), diff --git a/chrome/browser/ui/views/download/download_shelf_view.cc b/chrome/browser/ui/views/download/download_shelf_view.cc index f78c6ef..dbec3ed 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.cc +++ b/chrome/browser/ui/views/download/download_shelf_view.cc @@ -26,10 +26,10 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/background.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/link.h" -#include "views/background.h" // Max number of download views we'll contain. Any time a view is added and // we already have this many download views, one is removed. diff --git a/chrome/browser/ui/views/download/download_shelf_view.h b/chrome/browser/ui/views/download/download_shelf_view.h index a69f7fe..6e773eb 100644 --- a/chrome/browser/ui/views/download/download_shelf_view.h +++ b/chrome/browser/ui/views/download/download_shelf_view.h @@ -12,10 +12,10 @@ #include "base/compiler_specific.h" #include "chrome/browser/download/download_shelf.h" #include "ui/base/animation/animation_delegate.h" +#include "ui/views/accessible_pane_view.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/link_listener.h" #include "ui/views/mouse_watcher.h" -#include "views/accessible_pane_view.h" class BaseDownloadItemModel; class Browser; diff --git a/chrome/browser/ui/views/dropdown_bar_view.cc b/chrome/browser/ui/views/dropdown_bar_view.cc index 2c5aa56..1b66560 100644 --- a/chrome/browser/ui/views/dropdown_bar_view.cc +++ b/chrome/browser/ui/views/dropdown_bar_view.cc @@ -11,8 +11,8 @@ #include "grit/theme_resources_standard.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/background.h" #include "ui/views/widget/widget.h" -#include "views/background.h" namespace { diff --git a/chrome/browser/ui/views/dropdown_bar_view.h b/chrome/browser/ui/views/dropdown_bar_view.h index 900825e..44bff85c 100644 --- a/chrome/browser/ui/views/dropdown_bar_view.h +++ b/chrome/browser/ui/views/dropdown_bar_view.h @@ -8,7 +8,7 @@ #include "chrome/browser/ui/views/dropdown_bar_host.h" #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h" -#include "views/accessible_pane_view.h" +#include "ui/views/accessible_pane_view.h" namespace gfx { class Canvas; diff --git a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc index 03e3552..78d11bf 100644 --- a/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc +++ b/chrome/browser/ui/views/extensions/extension_install_dialog_view.cc @@ -16,6 +16,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/views/border.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" @@ -27,7 +28,6 @@ #include "ui/views/view.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" -#include "views/border.h" namespace { diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc index 134edf7..c37ffe7 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -22,7 +22,7 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/view.h" -#include "views/views_delegate.h" +#include "ui/views/views_delegate.h" namespace { diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index eb02c39..819c01e 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -26,11 +26,11 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" +#include "ui/views/background.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/label.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/widget/widget.h" -#include "views/background.h" // The amount of whitespace to have before the find button. static const int kWhiteSpaceAfterMatchCountLabel = 1; diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc index 1ea6aab..1f1e13f 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -35,8 +35,8 @@ #include "ui/views/controls/label.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/view_text_utils.h" #include "ui/views/widget/widget.h" -#include "views/view_text_utils.h" namespace { diff --git a/chrome/browser/ui/views/frame/browser_frame_aura.cc b/chrome/browser/ui/views/frame/browser_frame_aura.cc index 4cac0c8..d418f72 100644 --- a/chrome/browser/ui/views/frame/browser_frame_aura.cc +++ b/chrome/browser/ui/views/frame/browser_frame_aura.cc @@ -21,7 +21,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/compositor/layer.h" #include "ui/gfx/font.h" -#include "views/background.h" +#include "ui/views/background.h" namespace { diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.cc b/chrome/browser/ui/views/frame/browser_frame_gtk.cc index 2cccddc..9c94215 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.cc @@ -14,9 +14,9 @@ #include "chrome/browser/ui/views/frame/browser_view.h" #include "ui/base/hit_test.h" #include "ui/gfx/font.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" // static const gfx::Font& BrowserFrame::GetTitleFont() { diff --git a/chrome/browser/ui/views/frame/browser_frame_win.cc b/chrome/browser/ui/views/frame/browser_frame_win.cc index bdff2b4..bce4d34c 100644 --- a/chrome/browser/ui/views/frame/browser_frame_win.cc +++ b/chrome/browser/ui/views/frame/browser_frame_win.cc @@ -15,10 +15,10 @@ #include "grit/theme_resources.h" #include "ui/base/theme_provider.h" #include "ui/gfx/font.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget_win.h" #include "ui/views/widget/widget.h" #include "ui/views/window/non_client_view.h" -#include "views/views_delegate.h" #pragma comment(lib, "dwmapi.lib") diff --git a/chrome/browser/ui/views/infobars/infobar_background.h b/chrome/browser/ui/views/infobars/infobar_background.h index 7101f20..c2fa1cc 100644 --- a/chrome/browser/ui/views/infobars/infobar_background.h +++ b/chrome/browser/ui/views/infobars/infobar_background.h @@ -8,7 +8,7 @@ #include "base/compiler_specific.h" #include "chrome/browser/infobars/infobar_delegate.h" -#include "views/background.h" +#include "ui/views/background.h" class InfoBarBackground : public views::Background { public: diff --git a/chrome/browser/ui/views/infobars/infobar_container_view.h b/chrome/browser/ui/views/infobars/infobar_container_view.h index 9ee2d69..d729e4b 100644 --- a/chrome/browser/ui/views/infobars/infobar_container_view.h +++ b/chrome/browser/ui/views/infobars/infobar_container_view.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/infobars/infobar_container.h" -#include "views/accessible_pane_view.h" +#include "ui/views/accessible_pane_view.h" // The views-specific implementation of InfoBarContainer. class InfoBarContainerView : public views::AccessiblePaneView, diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc index 84a8572..ac10f04 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc @@ -20,7 +20,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/skia_util.h" -#include "views/border.h" +#include "ui/views/border.h" namespace { // Animation parameters. diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h index 9c28321..580b9f6 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.h @@ -10,8 +10,8 @@ #include "base/string16.h" #include "ui/gfx/size.h" +#include "ui/views/painter.h" #include "ui/views/view.h" -#include "views/painter.h" namespace gfx { class Canvas; diff --git a/chrome/browser/ui/views/menu_model_adapter_test.cc b/chrome/browser/ui/views/menu_model_adapter_test.cc index f2e4c5f..aceedec 100644 --- a/chrome/browser/ui/views/menu_model_adapter_test.cc +++ b/chrome/browser/ui/views/menu_model_adapter_test.cc @@ -15,9 +15,9 @@ #include "ui/views/controls/menu/submenu_view.h" #include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/test/test_views_delegate.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" namespace { diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index fcb42e6..6026336 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/notifications/balloon_view.cc @@ -40,8 +40,8 @@ #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/native/native_view_host.h" +#include "ui/views/painter.h" #include "ui/views/widget/widget.h" -#include "views/painter.h" using views::Widget; diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 549825d..9cc2dd2 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -27,10 +27,10 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" #include "ui/gfx/render_text.h" +#include "ui/views/border.h" #include "ui/views/controls/textfield/textfield.h" #include "ui/views/events/event.h" #include "ui/views/layout/fill_layout.h" -#include "views/border.h" #if defined(OS_WIN) #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc index 97c1265..d010d6e 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc @@ -13,7 +13,7 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/focus/widget_focus_manager.h" -#include "views/views_delegate.h" +#include "ui/views/views_delegate.h" //////////////////////////////////////////////////////////////////////////////// // NativeTabContentsContainerAura, public: diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc index 7fd5c80..83165dc 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc @@ -19,8 +19,8 @@ #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_aura.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" #include "webkit/glue/webdropdata.h" namespace { diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc index 1f7bb59..1a0c0ac 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_view_win.cc @@ -10,8 +10,8 @@ #include "content/browser/renderer_host/render_widget_host_view_win.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/browser/tab_contents/tab_contents_view.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" namespace { diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index b864725..a012661 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -24,6 +24,7 @@ #include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" +#include "ui/views/background.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/button/text_button.h" #include "ui/views/controls/link.h" @@ -34,7 +35,6 @@ #include "ui/views/layout/layout_constants.h" #include "ui/views/widget/widget.h" #include "ui/views/window/dialog_delegate.h" -#include "views/background.h" // The task manager window default size. static const int kDefaultWidth = 460; diff --git a/chrome/browser/ui/views/theme_background.h b/chrome/browser/ui/views/theme_background.h index ad491b5..9461f28 100644 --- a/chrome/browser/ui/views/theme_background.h +++ b/chrome/browser/ui/views/theme_background.h @@ -7,7 +7,7 @@ #pragma once #include "base/compiler_specific.h" -#include "views/background.h" +#include "ui/views/background.h" class BrowserView; diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index b6f33c0..c23ce94 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -18,10 +18,10 @@ #include "chrome/browser/ui/views/reload_button.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/animation/slide_animation.h" +#include "ui/views/accessible_pane_view.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/menu/view_menu_delegate.h" #include "ui/views/view.h" -#include "views/accessible_pane_view.h" class BrowserActionsContainer; class Browser; diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 89620d6..70eebf1 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -32,6 +32,7 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/skia_util.h" +#include "ui/views/background.h" #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/button/text_button.h" @@ -42,7 +43,6 @@ #include "ui/views/controls/menu/menu_scroll_view_container.h" #include "ui/views/controls/menu/submenu_view.h" #include "ui/views/widget/widget.h" -#include "views/background.h" using ui::MenuModel; using views::CustomButton; diff --git a/views/accessible_pane_view.cc b/ui/views/accessible_pane_view.cc index e0cce04..dfb0ca8 100644 --- a/views/accessible_pane_view.cc +++ b/ui/views/accessible_pane_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 "views/accessible_pane_view.h" +#include "ui/views/accessible_pane_view.h" #include "base/message_loop.h" #include "ui/base/accessibility/accessible_view_state.h" diff --git a/views/accessible_pane_view.h b/ui/views/accessible_pane_view.h index 104294e..4a150d0 100644 --- a/views/accessible_pane_view.h +++ b/ui/views/accessible_pane_view.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 VIEWS_ACCESSIBLE_PANE_VIEW_H_ -#define VIEWS_ACCESSIBLE_PANE_VIEW_H_ +#ifndef UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_ +#define UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_ #pragma once #include "base/hash_tables.h" @@ -96,4 +96,4 @@ class VIEWS_EXPORT AccessiblePaneView : public View, } // namespace views -#endif // VIEWS_ACCESSIBLE_PANE_VIEW_H_ +#endif // UI_VIEWS_ACCESSIBLE_PANE_VIEW_H_ diff --git a/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc index e554ae7..467f143 100644 --- a/views/accessible_pane_view_unittest.cc +++ b/ui/views/accessible_pane_view_unittest.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 "views/accessible_pane_view.h" +#include "ui/views/accessible_pane_view.h" #include "ui/base/accelerators/accelerator.h" #include "ui/views/controls/button/text_button.h" diff --git a/ui/views/animation/bounds_animator.h b/ui/views/animation/bounds_animator.h index 37f4ec4..d0e2c2e 100644 --- a/ui/views/animation/bounds_animator.h +++ b/ui/views/animation/bounds_animator.h @@ -13,7 +13,7 @@ #include "ui/base/animation/animation_container_observer.h" #include "ui/base/animation/animation_delegate.h" #include "ui/gfx/rect.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace ui { class SlideAnimation; diff --git a/views/background.cc b/ui/views/background.cc index 717261d..c606842 100644 --- a/views/background.cc +++ b/ui/views/background.cc @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/background.h" +#include "ui/views/background.h" #include "base/logging.h" #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/color_utils.h" +#include "ui/views/painter.h" #include "ui/views/view.h" -#include "views/painter.h" namespace views { diff --git a/views/background.h b/ui/views/background.h index 7bdd376..64f609c 100644 --- a/views/background.h +++ b/ui/views/background.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 VIEWS_BACKGROUND_H_ -#define VIEWS_BACKGROUND_H_ +#ifndef UI_VIEWS_BACKGROUND_H_ +#define UI_VIEWS_BACKGROUND_H_ #pragma once #include "build/build_config.h" @@ -14,7 +14,7 @@ #include "base/basictypes.h" #include "third_party/skia/include/core/SkColor.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Canvas; @@ -100,4 +100,4 @@ class VIEWS_EXPORT Background { } // namespace views -#endif // VIEWS_BACKGROUND_H_ +#endif // UI_VIEWS_BACKGROUND_H_ diff --git a/views/border.cc b/ui/views/border.cc index 3f90159..08127bd 100644 --- a/views/border.cc +++ b/ui/views/border.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 "views/border.h" +#include "ui/views/border.h" #include "base/logging.h" #include "ui/gfx/canvas.h" diff --git a/views/border.h b/ui/views/border.h index fc7bdc4..6b4808f 100644 --- a/views/border.h +++ b/ui/views/border.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 VIEWS_BORDER_H_ -#define VIEWS_BORDER_H_ +#ifndef UI_VIEWS_BORDER_H_ +#define UI_VIEWS_BORDER_H_ #pragma once #include "third_party/skia/include/core/SkColor.h" @@ -59,4 +59,4 @@ class VIEWS_EXPORT Border { } // namespace views -#endif // VIEWS_BORDER_H_ +#endif // UI_VIEWS_BORDER_H_ diff --git a/ui/views/bubble/bubble_border.h b/ui/views/bubble/bubble_border.h index 9dc535f..a79cd9e 100644 --- a/ui/views/bubble/bubble_border.h +++ b/ui/views/bubble/bubble_border.h @@ -7,8 +7,8 @@ #pragma once #include "base/compiler_specific.h" -#include "views/background.h" -#include "views/border.h" +#include "ui/views/background.h" +#include "ui/views/border.h" class SkBitmap; diff --git a/ui/views/context_menu_controller.h b/ui/views/context_menu_controller.h index 577ec62..5bee8b7 100644 --- a/ui/views/context_menu_controller.h +++ b/ui/views/context_menu_controller.h @@ -6,7 +6,7 @@ #define UI_VIEWS_CONTEXT_MENU_CONTROLLER_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Point; diff --git a/ui/views/controls/button/menu_button.h b/ui/views/controls/button/menu_button.h index 7512dfe..7f39e77 100644 --- a/ui/views/controls/button/menu_button.h +++ b/ui/views/controls/button/menu_button.h @@ -11,8 +11,8 @@ #include "base/string16.h" #include "base/time.h" #include "ui/gfx/font.h" +#include "ui/views/background.h" #include "ui/views/controls/button/text_button.h" -#include "views/background.h" namespace views { diff --git a/ui/views/controls/button/text_button.h b/ui/views/controls/button/text_button.h index fcf9299..c47727d 100644 --- a/ui/views/controls/button/text_button.h +++ b/ui/views/controls/button/text_button.h @@ -13,9 +13,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/font.h" +#include "ui/views/border.h" #include "ui/views/controls/button/custom_button.h" -#include "views/border.h" -#include "views/native_theme_delegate.h" +#include "ui/views/native_theme_delegate.h" namespace views { diff --git a/ui/views/controls/combobox/native_combobox_gtk.cc b/ui/views/controls/combobox/native_combobox_gtk.cc index a09ad57..6ef1fbf 100644 --- a/ui/views/controls/combobox/native_combobox_gtk.cc +++ b/ui/views/controls/combobox/native_combobox_gtk.cc @@ -13,8 +13,8 @@ #include "ui/base/models/combobox_model.h" #include "ui/views/controls/combobox/combobox.h" #include "ui/views/controls/combobox/native_combobox_views.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" namespace views { diff --git a/ui/views/controls/combobox/native_combobox_views.cc b/ui/views/controls/combobox/native_combobox_views.cc index 4311b8f..cb5e1ce 100644 --- a/ui/views/controls/combobox/native_combobox_views.cc +++ b/ui/views/controls/combobox/native_combobox_views.cc @@ -15,14 +15,14 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/font.h" #include "ui/gfx/path.h" +#include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/controls/combobox/combobox.h" #include "ui/views/controls/focusable_border.h" #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/controls/menu/submenu_view.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" -#include "views/background.h" -#include "views/border.h" #if defined(OS_LINUX) #include "ui/gfx/gtk_util.h" diff --git a/ui/views/controls/combobox/native_combobox_wrapper.h b/ui/views/controls/combobox/native_combobox_wrapper.h index 959871e..f11a2f6 100644 --- a/ui/views/controls/combobox/native_combobox_wrapper.h +++ b/ui/views/controls/combobox/native_combobox_wrapper.h @@ -7,7 +7,7 @@ #pragma once #include "ui/gfx/native_widget_types.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx{ class Size; diff --git a/ui/views/controls/focusable_border.h b/ui/views/controls/focusable_border.h index 903bb61..4b64bc6 100644 --- a/ui/views/controls/focusable_border.h +++ b/ui/views/controls/focusable_border.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" +#include "ui/views/border.h" #include "ui/views/view.h" -#include "views/border.h" namespace gfx { class Canvas; diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc index 452322e..aadac0e2 100644 --- a/ui/views/controls/label.cc +++ b/ui/views/controls/label.cc @@ -21,7 +21,7 @@ #include "ui/gfx/color_utils.h" #include "ui/gfx/font.h" #include "ui/gfx/insets.h" -#include "views/background.h" +#include "ui/views/background.h" namespace views { diff --git a/ui/views/controls/label_unittest.cc b/ui/views/controls/label_unittest.cc index 426614b..b2e2bc4 100644 --- a/ui/views/controls/label_unittest.cc +++ b/ui/views/controls/label_unittest.cc @@ -8,8 +8,8 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas.h" +#include "ui/views/border.h" #include "ui/views/controls/label.h" -#include "views/border.h" namespace views { diff --git a/ui/views/controls/menu/menu.h b/ui/views/controls/menu/menu.h index ed20389..2ee90f9 100644 --- a/ui/views/controls/menu/menu.h +++ b/ui/views/controls/menu/menu.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/string16.h" #include "ui/gfx/native_widget_types.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" class SkBitmap; diff --git a/ui/views/controls/menu/menu_2.h b/ui/views/controls/menu/menu_2.h index 898596e3..0b6fcae 100644 --- a/ui/views/controls/menu/menu_2.h +++ b/ui/views/controls/menu/menu_2.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/controls/menu/menu_wrapper.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Point; diff --git a/ui/views/controls/menu/menu_config.h b/ui/views/controls/menu/menu_config.h index 92014f9..ac568b0 100644 --- a/ui/views/controls/menu/menu_config.h +++ b/ui/views/controls/menu/menu_config.h @@ -8,7 +8,7 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/font.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc index bb96e93..c81f32f 100644 --- a/ui/views/controls/menu/menu_controller.cc +++ b/ui/views/controls/menu/menu_controller.cc @@ -19,10 +19,10 @@ #include "ui/views/controls/menu/menu_scroll_view_container.h" #include "ui/views/controls/menu/submenu_view.h" #include "ui/views/drag_utils.h" +#include "ui/views/view_constants.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" -#include "views/view_constants.h" -#include "views/views_delegate.h" #if defined(USE_AURA) #include "ui/aura/desktop.h" diff --git a/ui/views/controls/menu/menu_listener.h b/ui/views/controls/menu/menu_listener.h index 37eb8c0..120263b 100644 --- a/ui/views/controls/menu/menu_listener.h +++ b/ui/views/controls/menu/menu_listener.h @@ -6,7 +6,7 @@ #define UI_VIEWS_CONTROLS_MENU_MENU_LISTENER_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/controls/menu/menu_model_adapter.cc b/ui/views/controls/menu/menu_model_adapter.cc index 3848093..759fda3 100644 --- a/ui/views/controls/menu/menu_model_adapter.cc +++ b/ui/views/controls/menu/menu_model_adapter.cc @@ -8,7 +8,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" #include "ui/views/controls/menu/submenu_view.h" -#include "views/views_delegate.h" +#include "ui/views/views_delegate.h" namespace views { diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc index 775218f..131df17 100644 --- a/ui/views/controls/menu/menu_scroll_view_container.cc +++ b/ui/views/controls/menu/menu_scroll_view_container.cc @@ -14,11 +14,11 @@ #include "ui/gfx/canvas_skia.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/native_theme.h" +#include "ui/views/border.h" #include "ui/views/controls/menu/menu_config.h" #include "ui/views/controls/menu/menu_controller.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/submenu_view.h" -#include "views/border.h" using gfx::NativeTheme; diff --git a/ui/views/controls/menu/menu_wrapper.h b/ui/views/controls/menu/menu_wrapper.h index 2d21953..4975ebf 100644 --- a/ui/views/controls/menu/menu_wrapper.h +++ b/ui/views/controls/menu/menu_wrapper.h @@ -7,7 +7,7 @@ #pragma once #include "ui/gfx/native_widget_types.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Point; diff --git a/ui/views/controls/menu/native_menu_gtk.cc b/ui/views/controls/menu/native_menu_gtk.cc index 97ca02a..87b2fac 100644 --- a/ui/views/controls/menu/native_menu_gtk.cc +++ b/ui/views/controls/menu/native_menu_gtk.cc @@ -23,8 +23,8 @@ #include "ui/views/controls/menu/menu_2.h" #include "ui/views/controls/menu/menu_listener.h" #include "ui/views/controls/menu/nested_dispatcher_gtk.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget_gtk.h" -#include "views/views_delegate.h" namespace { diff --git a/ui/views/controls/menu/native_menu_win.h b/ui/views/controls/menu/native_menu_win.h index 91c7db5..08e07ba 100644 --- a/ui/views/controls/menu/native_menu_win.h +++ b/ui/views/controls/menu/native_menu_win.h @@ -15,7 +15,7 @@ #include "base/observer_list.h" #include "ui/base/models/simple_menu_model.h" #include "ui/views/controls/menu/menu_wrapper.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/controls/message_box_view.cc b/ui/views/controls/message_box_view.cc index b9564fe..1c27627 100644 --- a/ui/views/controls/message_box_view.cc +++ b/ui/views/controls/message_box_view.cc @@ -17,9 +17,9 @@ #include "ui/views/controls/textfield/textfield.h" #include "ui/views/layout/grid_layout.h" #include "ui/views/layout/layout_constants.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" #include "ui/views/window/client_view.h" -#include "views/views_delegate.h" const int kDefaultMessageWidth = 320; diff --git a/ui/views/controls/native/native_view_host_gtk.cc b/ui/views/controls/native/native_view_host_gtk.cc index ef706f3..b6a5042 100644 --- a/ui/views/controls/native/native_view_host_gtk.cc +++ b/ui/views/controls/native/native_view_host_gtk.cc @@ -11,10 +11,10 @@ #include "base/logging.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/focus/focus_manager.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/gtk_views_fixed.h" #include "ui/views/widget/native_widget_gtk.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" namespace views { diff --git a/ui/views/controls/native_control.cc b/ui/views/controls/native_control.cc index 7edbda6..e09c72a 100644 --- a/ui/views/controls/native_control.cc +++ b/ui/views/controls/native_control.cc @@ -18,11 +18,11 @@ #include "ui/base/l10n/l10n_util_win.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" +#include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/controls/native/native_view_host.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/widget/widget.h" -#include "views/background.h" -#include "views/border.h" using ui::ViewProp; diff --git a/ui/views/controls/progress_bar.cc b/ui/views/controls/progress_bar.cc index 74943bb..9ed1a3e 100644 --- a/ui/views/controls/progress_bar.cc +++ b/ui/views/controls/progress_bar.cc @@ -17,9 +17,9 @@ #include "ui/gfx/color_utils.h" #include "ui/gfx/font.h" #include "ui/gfx/insets.h" -#include "views/background.h" -#include "views/border.h" -#include "views/painter.h" +#include "ui/views/background.h" +#include "ui/views/border.h" +#include "ui/views/painter.h" namespace { diff --git a/ui/views/controls/scrollbar/base_scroll_bar.h b/ui/views/controls/scrollbar/base_scroll_bar.h index 09d581e..46515d5 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar.h +++ b/ui/views/controls/scrollbar/base_scroll_bar.h @@ -10,7 +10,7 @@ #include "ui/views/controls/button/image_button.h" #include "ui/views/controls/menu/menu_delegate.h" #include "ui/views/controls/scrollbar/scroll_bar.h" -#include "views/repeat_controller.h" +#include "ui/views/repeat_controller.h" namespace views { diff --git a/ui/views/controls/scrollbar/base_scroll_bar_button.h b/ui/views/controls/scrollbar/base_scroll_bar_button.h index 21bea4d..ead66e3 100644 --- a/ui/views/controls/scrollbar/base_scroll_bar_button.h +++ b/ui/views/controls/scrollbar/base_scroll_bar_button.h @@ -8,7 +8,7 @@ #include "ui/views/controls/button/custom_button.h" -#include "views/repeat_controller.h" +#include "ui/views/repeat_controller.h" #if defined(OS_LINUX) #include "ui/gfx/screen.h" diff --git a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc index 47c8f13..a8d0658 100644 --- a/ui/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/ui/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -23,7 +23,7 @@ #include "ui/views/widget/widget.h" #if defined(OS_LINUX) -#include "views/screen.h" +#include "ui/views/screen.h" #endif #undef min diff --git a/ui/views/controls/scrollbar/native_scroll_bar_wrapper.h b/ui/views/controls/scrollbar/native_scroll_bar_wrapper.h index dc8cc07..7c94a0a 100644 --- a/ui/views/controls/scrollbar/native_scroll_bar_wrapper.h +++ b/ui/views/controls/scrollbar/native_scroll_bar_wrapper.h @@ -6,7 +6,7 @@ #define UI_VIEWS_CONTROLS_SCROLLBAR_NATIVE_SCROLL_BAR_WRAPPER_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/controls/scrollbar/scroll_bar.h b/ui/views/controls/scrollbar/scroll_bar.h index 39263d6..1ed3d5c 100644 --- a/ui/views/controls/scrollbar/scroll_bar.h +++ b/ui/views/controls/scrollbar/scroll_bar.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/views/view.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/controls/single_split_view.cc b/ui/views/controls/single_split_view.cc index 333c388..94784f7 100644 --- a/ui/views/controls/single_split_view.cc +++ b/ui/views/controls/single_split_view.cc @@ -11,8 +11,8 @@ #include "skia/ext/skia_utils_win.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/gfx/canvas.h" +#include "ui/views/background.h" #include "ui/views/controls/single_split_view_listener.h" -#include "views/background.h" #if defined(TOOLKIT_USES_GTK) #include "ui/gfx/gtk_util.h" diff --git a/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc b/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc index 34e32ad..3afee6b 100644 --- a/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc +++ b/ui/views/controls/tabbed_pane/native_tabbed_pane_gtk.cc @@ -12,12 +12,12 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" #include "ui/gfx/skia_utils_gtk.h" +#include "ui/views/background.h" #include "ui/views/controls/tabbed_pane/tabbed_pane.h" #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h" #include "ui/views/layout/fill_layout.h" #include "ui/views/widget/native_widget.h" #include "ui/views/widget/widget.h" -#include "views/background.h" namespace views { diff --git a/ui/views/controls/table/table_view.h b/ui/views/controls/table/table_view.h index 78a0f55..f528200 100644 --- a/ui/views/controls/table/table_view.h +++ b/ui/views/controls/table/table_view.h @@ -15,7 +15,7 @@ #include "third_party/skia/include/core/SkColor.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/models/table_model_observer.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" #if defined(OS_WIN) #include <windows.h> diff --git a/ui/views/controls/textfield/native_textfield_views.cc b/ui/views/controls/textfield/native_textfield_views.cc index b324430..2163dbd 100644 --- a/ui/views/controls/textfield/native_textfield_views.cc +++ b/ui/views/controls/textfield/native_textfield_views.cc @@ -18,6 +18,8 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/insets.h" #include "ui/gfx/render_text.h" +#include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/controls/focusable_border.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" @@ -28,10 +30,8 @@ #include "ui/views/events/event.h" #include "ui/views/ime/input_method.h" #include "ui/views/metrics.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" -#include "views/background.h" -#include "views/border.h" -#include "views/views_delegate.h" #if defined(OS_LINUX) #include "ui/gfx/gtk_util.h" diff --git a/ui/views/controls/textfield/native_textfield_views.h b/ui/views/controls/textfield/native_textfield_views.h index 8ff590c..a60b931 100644 --- a/ui/views/controls/textfield/native_textfield_views.h +++ b/ui/views/controls/textfield/native_textfield_views.h @@ -11,13 +11,13 @@ #include "ui/base/ime/text_input_client.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/font.h" +#include "ui/views/border.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/textfield/native_textfield_wrapper.h" #include "ui/views/controls/textfield/textfield_views_model.h" #include "ui/views/drag_controller.h" #include "ui/views/touchui/touch_selection_controller.h" #include "ui/views/view.h" -#include "views/border.h" namespace base { class Time; diff --git a/ui/views/controls/textfield/native_textfield_views_unittest.cc b/ui/views/controls/textfield/native_textfield_views_unittest.cc index ad05177..21213d2 100644 --- a/ui/views/controls/textfield/native_textfield_views_unittest.cc +++ b/ui/views/controls/textfield/native_textfield_views_unittest.cc @@ -31,9 +31,9 @@ #include "ui/views/ime/mock_input_method.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget_private.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" // Drag and drop for aura in linux hasn't been implemented yet. // Bug http://crbug.com/97845 diff --git a/ui/views/controls/textfield/native_textfield_win.cc b/ui/views/controls/textfield/native_textfield_win.cc index a8164a2..fcc782b 100644 --- a/ui/views/controls/textfield/native_textfield_win.cc +++ b/ui/views/controls/textfield/native_textfield_win.cc @@ -32,8 +32,8 @@ #include "ui/views/controls/textfield/textfield_controller.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/metrics.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" -#include "views/views_delegate.h" namespace views { diff --git a/ui/views/controls/textfield/native_textfield_wrapper.h b/ui/views/controls/textfield/native_textfield_wrapper.h index 3bc3f1d..d73f893 100644 --- a/ui/views/controls/textfield/native_textfield_wrapper.h +++ b/ui/views/controls/textfield/native_textfield_wrapper.h @@ -8,7 +8,7 @@ #include "base/string16.h" #include "ui/gfx/native_widget_types.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Insets; diff --git a/ui/views/controls/textfield/textfield_views_model.cc b/ui/views/controls/textfield/textfield_views_model.cc index 0895f91..5c50986 100644 --- a/ui/views/controls/textfield/textfield_views_model.cc +++ b/ui/views/controls/textfield/textfield_views_model.cc @@ -17,7 +17,7 @@ #include "ui/gfx/font.h" #include "ui/gfx/render_text.h" #include "ui/views/controls/textfield/textfield.h" -#include "views/views_delegate.h" +#include "ui/views/views_delegate.h" namespace views { diff --git a/ui/views/controls/textfield/textfield_views_model.h b/ui/views/controls/textfield/textfield_views_model.h index d13a7b6d..ce1d88f 100644 --- a/ui/views/controls/textfield/textfield_views_model.h +++ b/ui/views/controls/textfield/textfield_views_model.h @@ -16,7 +16,7 @@ #include "ui/base/ime/composition_text.h" #include "ui/gfx/rect.h" #include "ui/gfx/render_text.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class RenderText; diff --git a/ui/views/controls/textfield/textfield_views_model_unittest.cc b/ui/views/controls/textfield/textfield_views_model_unittest.cc index 643be1f..585d849 100644 --- a/ui/views/controls/textfield/textfield_views_model_unittest.cc +++ b/ui/views/controls/textfield/textfield_views_model_unittest.cc @@ -18,7 +18,7 @@ #include "ui/views/controls/textfield/textfield_views_model.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/test/views_test_base.h" -#include "views/views_delegate.h" +#include "ui/views/views_delegate.h" namespace { diff --git a/ui/views/drag_controller.h b/ui/views/drag_controller.h index 94946d7..d9f3272 100644 --- a/ui/views/drag_controller.h +++ b/ui/views/drag_controller.h @@ -6,7 +6,7 @@ #define UI_VIEWS_DRAG_CONTROLLER_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Point; diff --git a/ui/views/drag_utils.h b/ui/views/drag_utils.h index 18098c6..cdf9e2c 100644 --- a/ui/views/drag_utils.h +++ b/ui/views/drag_utils.h @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/string16.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" class GURL; class SkBitmap; diff --git a/ui/views/events/event.h b/ui/views/events/event.h index bcf57c5..c0cf2e0 100644 --- a/ui/views/events/event.h +++ b/ui/views/events/event.h @@ -11,7 +11,7 @@ #include "ui/base/events.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/point.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace ui { class OSExchangeData; diff --git a/ui/views/examples/native_theme_button_example.cc b/ui/views/examples/native_theme_button_example.cc index 728110c..c37fc3e 100644 --- a/ui/views/examples/native_theme_button_example.cc +++ b/ui/views/examples/native_theme_button_example.cc @@ -16,7 +16,7 @@ #include "ui/views/controls/label.h" #include "ui/views/examples/example_combobox_model.h" #include "ui/views/layout/grid_layout.h" -#include "views/native_theme_painter.h" +#include "ui/views/native_theme_painter.h" namespace { diff --git a/ui/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h index 1e9f13b..9896818 100644 --- a/ui/views/examples/native_theme_button_example.h +++ b/ui/views/examples/native_theme_button_example.h @@ -11,8 +11,8 @@ #include "ui/views/controls/button/custom_button.h" #include "ui/views/controls/combobox/combobox_listener.h" #include "ui/views/examples/example_base.h" -#include "views/native_theme_delegate.h" -#include "views/native_theme_painter.h" +#include "ui/views/native_theme_delegate.h" +#include "ui/views/native_theme_painter.h" namespace views { class Combobox; diff --git a/ui/views/focus/accelerator_handler.h b/ui/views/focus/accelerator_handler.h index cd4dd71..d70c4bc 100644 --- a/ui/views/focus/accelerator_handler.h +++ b/ui/views/focus/accelerator_handler.h @@ -17,7 +17,7 @@ #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h index 8a9085a..0cb4671 100644 --- a/ui/views/focus/focus_manager.h +++ b/ui/views/focus/focus_manager.h @@ -15,7 +15,7 @@ #include "ui/base/accelerators/accelerator.h" #include "ui/gfx/native_widget_types.h" #include "ui/views/events/event.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" // The FocusManager class is used to handle focus traversal, store/restore // focused views and handle keyboard accelerators. diff --git a/ui/views/focus/focus_manager_factory.h b/ui/views/focus/focus_manager_factory.h index 7aae11d..d8da709 100644 --- a/ui/views/focus/focus_manager_factory.h +++ b/ui/views/focus/focus_manager_factory.h @@ -7,7 +7,7 @@ #pragma once #include "base/basictypes.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/focus/widget_focus_manager.h b/ui/views/focus/widget_focus_manager.h index 7a0143b..c36584b 100644 --- a/ui/views/focus/widget_focus_manager.h +++ b/ui/views/focus/widget_focus_manager.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/observer_list.h" #include "ui/gfx/native_widget_types.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" template <typename T> struct DefaultSingletonTraits; diff --git a/ui/views/ime/input_method.h b/ui/views/ime/input_method.h index 178b6db..310b6e1 100644 --- a/ui/views/ime/input_method.h +++ b/ui/views/ime/input_method.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "ui/base/ime/text_input_type.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace ui { class TextInputClient; diff --git a/ui/views/ime/input_method_delegate.h b/ui/views/ime/input_method_delegate.h index 369cc8b..d1a87ee 100644 --- a/ui/views/ime/input_method_delegate.h +++ b/ui/views/ime/input_method_delegate.h @@ -6,7 +6,7 @@ #define UI_VIEWS_IME_INPUT_METHOD_DELEGATE_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/ime/text_input_type_tracker.h b/ui/views/ime/text_input_type_tracker.h index 04917ee..aff74c8 100644 --- a/ui/views/ime/text_input_type_tracker.h +++ b/ui/views/ime/text_input_type_tracker.h @@ -9,7 +9,7 @@ #include "base/memory/singleton.h" #include "base/observer_list.h" #include "ui/base/ime/text_input_type.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/layout/layout_manager.h b/ui/views/layout/layout_manager.h index 1241c80..4633544 100644 --- a/ui/views/layout/layout_manager.h +++ b/ui/views/layout/layout_manager.h @@ -6,7 +6,7 @@ #define UI_VIEWS_LAYOUT_LAYOUT_MANAGER_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Size; diff --git a/ui/views/metrics.h b/ui/views/metrics.h index 1718ca7..62f2476 100644 --- a/ui/views/metrics.h +++ b/ui/views/metrics.h @@ -6,7 +6,7 @@ #define UI_VIEWS_METRICS_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/mouse_watcher.h b/ui/views/mouse_watcher.h index cd739d2..3ef91f3 100644 --- a/ui/views/mouse_watcher.h +++ b/ui/views/mouse_watcher.h @@ -9,7 +9,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ui/gfx/insets.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/views/native_theme_delegate.h b/ui/views/native_theme_delegate.h index 3ebd4f7..bd6051e 100644 --- a/views/native_theme_delegate.h +++ b/ui/views/native_theme_delegate.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_NATIVE_THEME_DELEGATE_H_ -#define VIEWS_NATIVE_THEME_DELEGATE_H_ +#ifndef UI_VIEWS_NATIVE_THEME_DELEGATE_H_ +#define UI_VIEWS_NATIVE_THEME_DELEGATE_H_ #pragma once #include "ui/gfx/native_theme.h" #include "ui/gfx/rect.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { @@ -50,4 +50,4 @@ class VIEWS_EXPORT NativeThemeDelegate { } // namespace views -#endif // VIEWS_NATIVE_THEME_DELEGATE_H_ +#endif // UI_VIEWS_NATIVE_THEME_DELEGATE_H_ diff --git a/views/native_theme_painter.cc b/ui/views/native_theme_painter.cc index 584667b9..30299ac 100644 --- a/views/native_theme_painter.cc +++ b/ui/views/native_theme_painter.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/native_theme_painter.h" +#include "ui/views/native_theme_painter.h" #include "base/logging.h" #include "ui/base/animation/animation.h" #include "ui/gfx/canvas.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/rect.h" -#include "views/native_theme_delegate.h" +#include "ui/views/native_theme_delegate.h" namespace views { diff --git a/views/native_theme_painter.h b/ui/views/native_theme_painter.h index 1d52858..f21b731 100644 --- a/views/native_theme_painter.h +++ b/ui/views/native_theme_painter.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_NATIVE_THEME_PAINTER_H_ -#define VIEWS_NATIVE_THEME_PAINTER_H_ +#ifndef UI_VIEWS_NATIVE_THEME_PAINTER_H_ +#define UI_VIEWS_NATIVE_THEME_PAINTER_H_ #pragma once #include "base/compiler_specific.h" -#include "views/painter.h" +#include "ui/views/painter.h" namespace gfx { class Canvas; @@ -42,4 +42,4 @@ class VIEWS_EXPORT NativeThemePainter : public Painter { } // namespace views -#endif // VIEWS_NATIVE_THEME_PAINTER_H_ +#endif // UI_VIEWS_NATIVE_THEME_PAINTER_H_ diff --git a/views/paint_lock.cc b/ui/views/paint_lock.cc index 3b2ce1d..0da6386 100644 --- a/views/paint_lock.cc +++ b/ui/views/paint_lock.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 "views/paint_lock.h" +#include "ui/views/paint_lock.h" #include "ui/views/view.h" diff --git a/views/paint_lock.h b/ui/views/paint_lock.h index d194597..41e3083 100644 --- a/views/paint_lock.h +++ b/ui/views/paint_lock.h @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_PAINT_LOCK_H_ -#define VIEWS_PAINT_LOCK_H_ +#ifndef UI_VIEWS_PAINT_LOCK_H_ +#define UI_VIEWS_PAINT_LOCK_H_ #pragma once #include "base/basictypes.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { @@ -33,4 +33,4 @@ class VIEWS_EXPORT PaintLock { } // namespace views -#endif // VIEWS_PAINT_LOCK_H_ +#endif // UI_VIEWS_PAINT_LOCK_H_ diff --git a/views/painter.cc b/ui/views/painter.cc index 5b2fc12..ef5cfbf 100644 --- a/views/painter.cc +++ b/ui/views/painter.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 "views/painter.h" +#include "ui/views/painter.h" #include "base/logging.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/views/painter.h b/ui/views/painter.h index 9b8e602..575eae9 100644 --- a/views/painter.h +++ b/ui/views/painter.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_PAINTER_H_ -#define VIEWS_PAINTER_H_ +#ifndef UI_VIEWS_PAINTER_H_ +#define UI_VIEWS_PAINTER_H_ #pragma once #include "base/basictypes.h" #include "base/compiler_specific.h" #include "third_party/skia/include/core/SkColor.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Canvas; @@ -85,4 +85,4 @@ class VIEWS_EXPORT HorizontalPainter : public Painter { } // namespace views -#endif // VIEWS_PAINTER_H_ +#endif // UI_VIEWS_PAINTER_H_ diff --git a/views/repeat_controller.cc b/ui/views/repeat_controller.cc index 416b591..dd90aaa 100644 --- a/views/repeat_controller.cc +++ b/ui/views/repeat_controller.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 "views/repeat_controller.h" +#include "ui/views/repeat_controller.h" using base::TimeDelta; diff --git a/views/repeat_controller.h b/ui/views/repeat_controller.h index 3384cf0..1efe50e4 100644 --- a/views/repeat_controller.h +++ b/ui/views/repeat_controller.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 VIEWS_REPEAT_CONTROLLER_H_ -#define VIEWS_REPEAT_CONTROLLER_H_ +#ifndef UI_VIEWS_REPEAT_CONTROLLER_H_ +#define UI_VIEWS_REPEAT_CONTROLLER_H_ #pragma once #include "base/callback.h" @@ -47,4 +47,4 @@ class RepeatController { } // namespace views -#endif // #ifndef VIEWS_REPEAT_CONTROLLER_H_ +#endif // UI_VIEWS_REPEAT_CONTROLLER_H_ diff --git a/views/run_all_unittests.cc b/ui/views/run_all_unittests.cc index e675291..e675291 100644 --- a/views/run_all_unittests.cc +++ b/ui/views/run_all_unittests.cc diff --git a/ui/views/test/test_views_delegate.h b/ui/views/test/test_views_delegate.h index 7812701..f2c8f69 100644 --- a/ui/views/test/test_views_delegate.h +++ b/ui/views/test/test_views_delegate.h @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "ui/base/accessibility/accessibility_types.h" -#include "views/views_delegate.h" +#include "ui/views/views_delegate.h" namespace ui { class Clipboard; diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc index 894c8a4..906a605 100644 --- a/ui/views/touchui/touch_selection_controller_impl.cc +++ b/ui/views/touchui/touch_selection_controller_impl.cc @@ -17,6 +17,7 @@ #include "ui/gfx/screen.h" #include "ui/gfx/size.h" #include "ui/gfx/transform.h" +#include "ui/views/background.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/custom_button.h" #include "ui/views/controls/button/text_button.h" @@ -24,7 +25,6 @@ #include "ui/views/controls/menu/menu_config.h" #include "ui/views/layout/box_layout.h" #include "ui/views/widget/widget.h" -#include "views/background.h" namespace { diff --git a/ui/views/touchui/touch_selection_controller_impl.h b/ui/views/touchui/touch_selection_controller_impl.h index f0d5a5d..7e8eff4 100644 --- a/ui/views/touchui/touch_selection_controller_impl.h +++ b/ui/views/touchui/touch_selection_controller_impl.h @@ -10,7 +10,7 @@ #include "ui/gfx/point.h" #include "ui/views/touchui/touch_selection_controller.h" #include "ui/views/view.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { diff --git a/ui/views/view.cc b/ui/views/view.cc index 09d3cbe..9179375 100644 --- a/ui/views/view.cc +++ b/ui/views/view.cc @@ -23,15 +23,15 @@ #include "ui/gfx/path.h" #include "ui/gfx/point3.h" #include "ui/gfx/transform.h" +#include "ui/views/background.h" #include "ui/views/context_menu_controller.h" #include "ui/views/drag_controller.h" #include "ui/views/layout/layout_manager.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget_private.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/tooltip_manager.h" #include "ui/views/widget/widget.h" -#include "views/background.h" -#include "views/views_delegate.h" #if defined(OS_WIN) #include "base/win/scoped_gdi_object.h" diff --git a/ui/views/view.h b/ui/views/view.h index 6e8eb28..d6e6ca9 100644 --- a/ui/views/view.h +++ b/ui/views/view.h @@ -22,9 +22,9 @@ #include "ui/gfx/compositor/layer_delegate.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/rect.h" +#include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/events/event.h" -#include "views/background.h" -#include "views/border.h" #if defined(OS_WIN) #include "base/win/scoped_comptr.h" diff --git a/views/view_constants.cc b/ui/views/view_constants.cc index 0e2ed17..63a5a22 100644 --- a/views/view_constants.cc +++ b/ui/views/view_constants.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "views/view_constants.h" +#include "ui/views/view_constants.h" namespace views { diff --git a/views/view_constants.h b/ui/views/view_constants.h index cdee4bf..96f07c4 100644 --- a/views/view_constants.h +++ b/ui/views/view_constants.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef VIEWS_VIEW_CONSTANTS_H_ -#define VIEWS_VIEW_CONSTANTS_H_ +#ifndef UI_VIEWS_VIEW_CONSTANTS_H_ +#define UI_VIEWS_VIEW_CONSTANTS_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace views { @@ -25,4 +25,4 @@ VIEWS_EXPORT extern const int kDropBetweenPixels; } // namespace views -#endif // VIEWS_VIEW_CONSTANTS_H_ +#endif // UI_VIEWS_VIEW_CONSTANTS_H_ diff --git a/views/view_text_utils.cc b/ui/views/view_text_utils.cc index 739a374..ebd787ea 100644 --- a/views/view_text_utils.cc +++ b/ui/views/view_text_utils.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 "views/view_text_utils.h" +#include "ui/views/view_text_utils.h" #include "base/i18n/bidi_line_iterator.h" #include "base/i18n/break_iterator.h" diff --git a/views/view_text_utils.h b/ui/views/view_text_utils.h index 68ed201..c0141a5 100644 --- a/views/view_text_utils.h +++ b/ui/views/view_text_utils.h @@ -1,15 +1,13 @@ // Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -// -// This file defines utility functions for working with text in views. -#ifndef VIEWS_VIEW_TEXT_UTILS_H_ -#define VIEWS_VIEW_TEXT_UTILS_H_ +#ifndef UI_VIEWS_VIEW_TEXT_UTILS_H_ +#define UI_VIEWS_VIEW_TEXT_UTILS_H_ #pragma once #include "base/string16.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Canvas; @@ -23,6 +21,8 @@ class Label; class Link; } +// This file defines utility functions for working with text in views. + namespace view_text_utils { // Draws a string onto the canvas (wrapping if needed) while also keeping @@ -73,4 +73,4 @@ void WrapIfWordDoesntFit(int word_width, } // namespace view_text_utils -#endif // CHROME_BROWSER_VIEWS_VIEW_TEXT_UTILS_H_ +#endif // UI_VIEWS_VIEW_TEXT_UTILS_H_ diff --git a/ui/views/view_unittest.cc b/ui/views/view_unittest.cc index e64fae6..224b5c9c 100644 --- a/ui/views/view_unittest.cc +++ b/ui/views/view_unittest.cc @@ -21,6 +21,7 @@ #include "ui/gfx/compositor/test/test_texture.h" #include "ui/gfx/path.h" #include "ui/gfx/transform.h" +#include "ui/views/background.h" #include "ui/views/controls/button/button_dropdown.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/native/native_view_host.h" @@ -32,11 +33,10 @@ #include "ui/views/test/views_test_base.h" #include "ui/views/touchui/gesture_manager.h" #include "ui/views/view.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget.h" #include "ui/views/widget/root_view.h" #include "ui/views/window/dialog_delegate.h" -#include "views/background.h" -#include "views/views_delegate.h" #if defined(OS_WIN) #include "ui/views/test/test_views_delegate.h" diff --git a/views/views_delegate.h b/ui/views/views_delegate.h index 210031a..6194617d 100644 --- a/views/views_delegate.h +++ b/ui/views/views_delegate.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 VIEWS_VIEWS_DELEGATE_H_ -#define VIEWS_VIEWS_DELEGATE_H_ +#ifndef UI_VIEWS_VIEWS_DELEGATE_H_ +#define UI_VIEWS_VIEWS_DELEGATE_H_ #pragma once #include <string> @@ -15,7 +15,7 @@ #include "base/string16.h" #include "ui/base/accessibility/accessibility_types.h" #include "ui/base/ui_base_types.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Rect; @@ -88,4 +88,4 @@ class VIEWS_EXPORT ViewsDelegate { } // namespace views -#endif // VIEWS_VIEWS_DELEGATE_H_ +#endif // UI_VIEWS_VIEWS_DELEGATE_H_ diff --git a/views/views_export.h b/ui/views/views_export.h index 312bf4e..f77ac98 100644 --- a/views/views_export.h +++ b/ui/views/views_export.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 VIEWS_VIEWS_EXPORT_H_ -#define VIEWS_VIEWS_EXPORT_H_ +#ifndef UI_VIEWS_VIEWS_EXPORT_H_ +#define UI_VIEWS_VIEWS_EXPORT_H_ #pragma once // Defines VIEWS_EXPORT so that functionality implemented by the Views module @@ -26,4 +26,4 @@ #define VIEWS_EXPORT #endif -#endif // VIEWS_VIEWS_EXPORT_H_ +#endif // UI_VIEWS_VIEWS_EXPORT_H_ diff --git a/ui/views/widget/default_theme_provider.h b/ui/views/widget/default_theme_provider.h index a47062e..d0705e2 100644 --- a/ui/views/widget/default_theme_provider.h +++ b/ui/views/widget/default_theme_provider.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "ui/base/theme_provider.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" class Profile; diff --git a/ui/views/widget/monitor_win.h b/ui/views/widget/monitor_win.h index 627c6ee..4fcbd6f 100644 --- a/ui/views/widget/monitor_win.h +++ b/ui/views/widget/monitor_win.h @@ -7,7 +7,8 @@ #pragma once #include <windows.h> -#include "views/views_export.h" + +#include "ui/views/views_export.h" namespace gfx { class Rect; diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h index f0fe3ff..a911fec 100644 --- a/ui/views/widget/native_widget_aura.h +++ b/ui/views/widget/native_widget_aura.h @@ -11,8 +11,8 @@ #include "ui/aura/client/window_drag_drop_delegate.h" #include "ui/aura/window_delegate.h" #include "ui/base/events.h" +#include "ui/views/views_export.h" #include "ui/views/widget/native_widget_private.h" -#include "views/views_export.h" namespace aura { class Window; diff --git a/ui/views/widget/native_widget_delegate.h b/ui/views/widget/native_widget_delegate.h index 3c33581..317374a 100644 --- a/ui/views/widget/native_widget_delegate.h +++ b/ui/views/widget/native_widget_delegate.h @@ -7,7 +7,7 @@ #pragma once #include "ui/base/events.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Canvas; diff --git a/ui/views/widget/native_widget_gtk.cc b/ui/views/widget/native_widget_gtk.cc index 22f1ab4..a970976 100644 --- a/ui/views/widget/native_widget_gtk.cc +++ b/ui/views/widget/native_widget_gtk.cc @@ -37,13 +37,13 @@ #include "ui/views/controls/textfield/native_textfield_views.h" #include "ui/views/focus/view_storage.h" #include "ui/views/ime/input_method_gtk.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/drop_target_gtk.h" #include "ui/views/widget/gtk_views_fixed.h" #include "ui/views/widget/gtk_views_window.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/tooltip_manager_gtk.h" #include "ui/views/widget/widget_delegate.h" -#include "views/views_delegate.h" #if defined(HAVE_IBUS) #include "ui/views/ime/input_method_ibus.h" diff --git a/ui/views/widget/native_widget_win.cc b/ui/views/widget/native_widget_win.cc index 7d0b7c0..5e3ed37 100644 --- a/ui/views/widget/native_widget_win.cc +++ b/ui/views/widget/native_widget_win.cc @@ -38,6 +38,7 @@ #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/view_storage.h" #include "ui/views/ime/input_method_win.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/aero_tooltip_manager.h" #include "ui/views/widget/child_window_message_processor.h" #include "ui/views/widget/drop_target_win.h" @@ -46,7 +47,6 @@ #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/native_frame_view.h" -#include "views/views_delegate.h" #pragma comment(lib, "dwmapi.lib") diff --git a/ui/views/widget/tooltip_manager.h b/ui/views/widget/tooltip_manager.h index f7d1a8b..63684b6 100644 --- a/ui/views/widget/tooltip_manager.h +++ b/ui/views/widget/tooltip_manager.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/string16.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Font; diff --git a/ui/views/widget/tooltip_manager_views.cc b/ui/views/widget/tooltip_manager_views.cc index 264dbc3..3b2d677 100644 --- a/ui/views/widget/tooltip_manager_views.cc +++ b/ui/views/widget/tooltip_manager_views.cc @@ -26,12 +26,12 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" #include "ui/gfx/screen.h" +#include "ui/views/background.h" +#include "ui/views/border.h" #include "ui/views/events/event.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/view.h" #include "ui/views/widget/native_widget.h" -#include "views/background.h" -#include "views/border.h" namespace { SkColor kTooltipBackground = 0xFF7F7F00; diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc index 8d8fad7..472e284 100644 --- a/ui/views/widget/widget.cc +++ b/ui/views/widget/widget.cc @@ -19,13 +19,13 @@ #include "ui/views/focus/view_storage.h" #include "ui/views/focus/widget_focus_manager.h" #include "ui/views/ime/input_method.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/default_theme_provider.h" #include "ui/views/widget/native_widget_private.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/tooltip_manager.h" #include "ui/views/widget/widget_delegate.h" #include "ui/views/window/custom_frame_view.h" -#include "views/views_delegate.h" namespace { diff --git a/ui/views/widget/widget_delegate.cc b/ui/views/widget/widget_delegate.cc index 84af2343..6456c61 100644 --- a/ui/views/widget/widget_delegate.cc +++ b/ui/views/widget/widget_delegate.cc @@ -8,9 +8,9 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/views/bubble/bubble_delegate.h" #include "ui/views/view.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/widget.h" #include "ui/views/window/client_view.h" -#include "views/views_delegate.h" namespace views { diff --git a/ui/views/widget/widget_unittest.cc b/ui/views/widget/widget_unittest.cc index 90632c6..81e7515 100644 --- a/ui/views/widget/widget_unittest.cc +++ b/ui/views/widget/widget_unittest.cc @@ -10,8 +10,8 @@ #include "ui/gfx/point.h" #include "ui/views/test/test_views_delegate.h" #include "ui/views/test/views_test_base.h" +#include "ui/views/views_delegate.h" #include "ui/views/widget/native_widget_delegate.h" -#include "views/views_delegate.h" #if defined(USE_AURA) #include "ui/aura/window.h" diff --git a/ui/views/widget/window_manager.h b/ui/views/widget/window_manager.h index accef0a..abb6232 100644 --- a/ui/views/widget/window_manager.h +++ b/ui/views/widget/window_manager.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "ui/base/events.h" -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Point; diff --git a/ui/views/window/window_shape.h b/ui/views/window/window_shape.h index 6db3add..2dfc214 100644 --- a/ui/views/window/window_shape.h +++ b/ui/views/window/window_shape.h @@ -6,7 +6,7 @@ #define UI_VIEWS_WINDOW_WINDOW_SHAPE_H_ #pragma once -#include "views/views_export.h" +#include "ui/views/views_export.h" namespace gfx { class Size; diff --git a/views/views.gyp b/views/views.gyp index 63373b8..3a47930 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -45,30 +45,16 @@ ], 'sources': [ # All .cc, .h under views, except unittests - 'accessible_pane_view.cc', - 'accessible_pane_view.h', - 'background.cc', - 'background.h', - 'border.cc', - 'border.h', - 'native_theme_delegate.h', - 'native_theme_painter.cc', - 'native_theme_painter.h', - 'paint_lock.cc', - 'paint_lock.h', - 'painter.cc', - 'painter.h', - 'repeat_controller.cc', - 'repeat_controller.h', - 'view_constants.cc', - 'view_constants.h', - 'view_text_utils.cc', - 'view_text_utils.h', - 'views_delegate.h', '../ui/views/accessibility/native_view_accessibility_win.cc', '../ui/views/accessibility/native_view_accessibility_win.h', + '../ui/views/accessible_pane_view.cc', + '../ui/views/accessible_pane_view.h', '../ui/views/animation/bounds_animator.cc', '../ui/views/animation/bounds_animator.h', + '../ui/views/background.cc', + '../ui/views/background.h', + '../ui/views/border.cc', + '../ui/views/border.h', '../ui/views/bubble/border_contents_view.cc', '../ui/views/bubble/border_contents_view.h', '../ui/views/bubble/bubble_border.cc', @@ -316,15 +302,29 @@ '../ui/views/metrics_win.cc', '../ui/views/mouse_watcher.cc', '../ui/views/mouse_watcher.h', + '../ui/views/native_theme_delegate.h', + '../ui/views/native_theme_painter.cc', + '../ui/views/native_theme_painter.h', + '../ui/views/paint_lock.cc', + '../ui/views/paint_lock.h', + '../ui/views/painter.cc', + '../ui/views/painter.h', + '../ui/views/repeat_controller.cc', + '../ui/views/repeat_controller.h', '../ui/views/touchui/gesture_manager.cc', '../ui/views/touchui/gesture_manager.h', '../ui/views/touchui/touch_selection_controller.cc', '../ui/views/touchui/touch_selection_controller.h', '../ui/views/view.cc', '../ui/views/view.h', + '../ui/views/view_constants.cc', + '../ui/views/view_constants.h', '../ui/views/view_aura.cc', '../ui/views/view_gtk.cc', + '../ui/views/view_text_utils.cc', + '../ui/views/view_text_utils.h', '../ui/views/view_win.cc', + '../ui/views/views_delegate.h', '../ui/views/widget/aero_tooltip_manager.cc', '../ui/views/widget/aero_tooltip_manager.h', '../ui/views/widget/child_window_message_processor.cc', @@ -507,6 +507,7 @@ '..', ], 'sources': [ + '../ui/views/accessible_pane_view_unittest.cc', '../ui/views/animation/bounds_animator_unittest.cc', '../ui/views/bubble/border_contents_unittest.cc', '../ui/views/bubble/bubble_delegate_unittest.cc', @@ -542,8 +543,7 @@ '../ui/views/widget/native_widget_unittest.cc', '../ui/views/widget/native_widget_win_unittest.cc', '../ui/views/widget/widget_unittest.cc', - 'accessible_pane_view_unittest.cc', - 'run_all_unittests.cc', + '../ui/views/run_all_unittests.cc', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', |