diff options
Diffstat (limited to 'chrome/browser/ui')
49 files changed, 49 insertions, 49 deletions
diff --git a/chrome/browser/ui/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc index 0bc2dd6..57ed584 100644 --- a/chrome/browser/ui/input_window_dialog_win.cc +++ b/chrome/browser/ui/input_window_dialog_win.cc @@ -10,7 +10,7 @@ #include "grit/generated_resources.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/about_ipc_dialog.cc b/chrome/browser/ui/views/about_ipc_dialog.cc index 9265726..0e77260 100644 --- a/chrome/browser/ui/views/about_ipc_dialog.cc +++ b/chrome/browser/ui/views/about_ipc_dialog.cc @@ -32,7 +32,7 @@ #include "net/url_request/url_request_job_tracker.h" #include "views/controls/button/text_button.h" #include "views/controls/native/native_view_host.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" 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 6948e93..3ee061a 100644 --- a/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc +++ b/chrome/browser/ui/views/accessibility_event_router_views_unittest.cc @@ -15,7 +15,7 @@ #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" #include "views/controls/button/native_button.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/views_delegate.h" #include "views/widget/root_view.h" #include "views/window/window.h" 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 59c87e5..a78656ee 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -31,7 +31,7 @@ #include "unicode/ubidi.h" #include "views/controls/button/text_button.h" #include "views/controls/label.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/painter.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc index b789f64..79a289e 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.cc +++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc @@ -43,7 +43,7 @@ #include "views/controls/scroll_view.h" #include "views/controls/separator.h" #include "views/controls/table/table_view.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmark_bubble_view.cc index 8d663e5..a6b6ac7 100644 --- a/chrome/browser/ui/views/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmark_bubble_view.cc @@ -26,7 +26,7 @@ #include "views/controls/textfield/textfield.h" #include "views/event.h" #include "views/focus/focus_manager.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/client_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmark_editor_view.cc index 1682651..2aa65f2 100644 --- a/chrome/browser/ui/views/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmark_editor_view.cc @@ -26,7 +26,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/label.h" #include "views/controls/menu/menu_2.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/clear_browsing_data.cc b/chrome/browser/ui/views/clear_browsing_data.cc index e6f46ce..18002eb 100644 --- a/chrome/browser/ui/views/clear_browsing_data.cc +++ b/chrome/browser/ui/views/clear_browsing_data.cc @@ -25,7 +25,7 @@ #include "views/controls/label.h" #include "views/controls/separator.h" #include "views/controls/throbber.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/dialog_client_view.h" diff --git a/chrome/browser/ui/views/clear_browsing_data_view.cc b/chrome/browser/ui/views/clear_browsing_data_view.cc index f2623b8..11cffef 100644 --- a/chrome/browser/ui/views/clear_browsing_data_view.cc +++ b/chrome/browser/ui/views/clear_browsing_data_view.cc @@ -22,7 +22,7 @@ #include "views/controls/label.h" #include "views/controls/separator.h" #include "views/controls/throbber.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/dialog_client_view.h" diff --git a/chrome/browser/ui/views/clear_data_view.cc b/chrome/browser/ui/views/clear_data_view.cc index d4f6431..b19a34a 100644 --- a/chrome/browser/ui/views/clear_data_view.cc +++ b/chrome/browser/ui/views/clear_data_view.cc @@ -21,7 +21,7 @@ #include "views/controls/label.h" #include "views/controls/separator.h" #include "views/controls/throbber.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/dialog_client_view.h" diff --git a/chrome/browser/ui/views/clear_server_data.cc b/chrome/browser/ui/views/clear_server_data.cc index 25ec16c..84b9605 100644 --- a/chrome/browser/ui/views/clear_server_data.cc +++ b/chrome/browser/ui/views/clear_server_data.cc @@ -24,7 +24,7 @@ #include "views/controls/label.h" #include "views/controls/separator.h" #include "views/controls/throbber.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/dialog_client_view.h" diff --git a/chrome/browser/ui/views/clear_server_data.h b/chrome/browser/ui/views/clear_server_data.h index 8682d84..c80d8b4 100644 --- a/chrome/browser/ui/views/clear_server_data.h +++ b/chrome/browser/ui/views/clear_server_data.h @@ -13,7 +13,7 @@ #include "views/controls/button/button.h" #include "views/controls/label.h" #include "views/controls/link.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/view.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 3b4da83..9005770 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -19,8 +19,8 @@ #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/separator.h" -#include "views/grid_layout.h" #include "views/layout/box_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/root_view.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index fbb67e1..a8f8cf1 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc @@ -26,7 +26,7 @@ #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/separator.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "webkit/glue/plugins/plugin_list.h" diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc index 1de75b9..608a4dc 100644 --- a/chrome/browser/ui/views/cookie_info_view.cc +++ b/chrome/browser/ui/views/cookie_info_view.cc @@ -22,7 +22,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/tree/tree_view.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" static const int kCookieInfoViewBorderSize = 1; diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index eb5d5d3..b6b528d 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -28,7 +28,7 @@ #include "views/controls/button/checkbox.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/database_info_view.cc b/chrome/browser/ui/views/database_info_view.cc index d5b7ef9..e048bd5 100644 --- a/chrome/browser/ui/views/database_info_view.cc +++ b/chrome/browser/ui/views/database_info_view.cc @@ -13,7 +13,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" static const int kDatabaseInfoViewBorderSize = 1; diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index 1854f56..6ffba6a 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -22,7 +22,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/dialog_client_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index c3aaf95..7ef7d27 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -18,7 +18,7 @@ #include "views/controls/label.h" #include "views/controls/image_view.h" #include "views/controls/table/table_view.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 3008763..f3c69ae 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -77,7 +77,7 @@ #include "views/controls/single_split_view.h" #include "views/focus/external_focus_tracker.h" #include "views/focus/view_storage.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/widget/root_view.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/generic_info_view.cc b/chrome/browser/ui/views/generic_info_view.cc index b03916b..c481336 100644 --- a/chrome/browser/ui/views/generic_info_view.cc +++ b/chrome/browser/ui/views/generic_info_view.cc @@ -10,7 +10,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" GenericInfoView::GenericInfoView(int number_of_rows) diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 43391cc..a6b610c 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -19,11 +19,11 @@ #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" -#include "views/grid_layout.h" #include "views/controls/button/native_button.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/table/group_table_view.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/client_view.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/importer_view.cc b/chrome/browser/ui/views/importer_view.cc index a04817c..abb5ace 100644 --- a/chrome/browser/ui/views/importer_view.cc +++ b/chrome/browser/ui/views/importer_view.cc @@ -14,7 +14,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/importing_progress_view.cc b/chrome/browser/ui/views/importing_progress_view.cc index 3ee37e5..d93db0f 100644 --- a/chrome/browser/ui/views/importing_progress_view.cc +++ b/chrome/browser/ui/views/importing_progress_view.cc @@ -11,7 +11,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/controls/throbber.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/indexed_db_info_view.cc b/chrome/browser/ui/views/indexed_db_info_view.cc index e72b947..36e8aec 100644 --- a/chrome/browser/ui/views/indexed_db_info_view.cc +++ b/chrome/browser/ui/views/indexed_db_info_view.cc @@ -13,7 +13,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" static const int kIndexedDBInfoViewBorderSize = 1; diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc index 10c7621..99ca448 100644 --- a/chrome/browser/ui/views/instant_confirm_view.cc +++ b/chrome/browser/ui/views/instant_confirm_view.cc @@ -15,7 +15,7 @@ #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/keyword_editor_view.cc b/chrome/browser/ui/views/keyword_editor_view.cc index ef8314a9..8689889 100644 --- a/chrome/browser/ui/views/keyword_editor_view.cc +++ b/chrome/browser/ui/views/keyword_editor_view.cc @@ -27,7 +27,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/table/table_view.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/local_storage_info_view.cc b/chrome/browser/ui/views/local_storage_info_view.cc index 021bea7..31488d2 100644 --- a/chrome/browser/ui/views/local_storage_info_view.cc +++ b/chrome/browser/ui/views/local_storage_info_view.cc @@ -13,7 +13,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" static const int kLocalStorageInfoViewBorderSize = 1; diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.cc b/chrome/browser/ui/views/local_storage_set_item_info_view.cc index 4e63e52..24dbded 100644 --- a/chrome/browser/ui/views/local_storage_set_item_info_view.cc +++ b/chrome/browser/ui/views/local_storage_set_item_info_view.cc @@ -12,7 +12,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" static const int kLocalStorageSetItemInfoViewBorderSize = 1; diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc index 9735acf..c65a947 100644 --- a/chrome/browser/ui/views/login_view.cc +++ b/chrome/browser/ui/views/login_view.cc @@ -13,7 +13,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index d4e928b..ae216a4 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -64,7 +64,7 @@ #include "views/controls/combobox/combobox.h" #include "views/controls/scroll_view.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/advanced_page_view.cc b/chrome/browser/ui/views/options/advanced_page_view.cc index 8ba523f..f947e23 100644 --- a/chrome/browser/ui/views/options/advanced_page_view.cc +++ b/chrome/browser/ui/views/options/advanced_page_view.cc @@ -19,7 +19,7 @@ #include "views/controls/message_box_view.h" #include "views/controls/button/native_button.h" #include "views/controls/scroll_view.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/dialog_delegate.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/content_filter_page_view.cc b/chrome/browser/ui/views/options/content_filter_page_view.cc index e7e8105..738fa7b 100644 --- a/chrome/browser/ui/views/options/content_filter_page_view.cc +++ b/chrome/browser/ui/views/options/content_filter_page_view.cc @@ -22,7 +22,7 @@ #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "views/controls/button/radio_button.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/content_page_view.cc b/chrome/browser/ui/views/options/content_page_view.cc index c908d20..d9331b0 100644 --- a/chrome/browser/ui/views/options/content_page_view.cc +++ b/chrome/browser/ui/views/options/content_page_view.cc @@ -33,7 +33,7 @@ #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "views/controls/button/radio_button.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/cookie_filter_page_view.cc b/chrome/browser/ui/views/options/cookie_filter_page_view.cc index cf22aa0..96bd344 100644 --- a/chrome/browser/ui/views/options/cookie_filter_page_view.cc +++ b/chrome/browser/ui/views/options/cookie_filter_page_view.cc @@ -13,7 +13,7 @@ #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "views/controls/button/checkbox.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" CookieFilterPageView::CookieFilterPageView(Profile* profile) diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc index c7e9b2d..7f1adde 100644 --- a/chrome/browser/ui/views/options/cookies_view.cc +++ b/chrome/browser/ui/views/options/cookies_view.cc @@ -25,7 +25,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/tree/tree_view.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" // static diff --git a/chrome/browser/ui/views/options/exception_editor_view.cc b/chrome/browser/ui/views/options/exception_editor_view.cc index fea92b3..fde7b0b 100644 --- a/chrome/browser/ui/views/options/exception_editor_view.cc +++ b/chrome/browser/ui/views/options/exception_editor_view.cc @@ -15,7 +15,7 @@ #include "ui/base/resource/resource_bundle.h" #include "views/controls/image_view.h" #include "views/controls/label.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/exceptions_page_view.cc b/chrome/browser/ui/views/options/exceptions_page_view.cc index b2e1774..8d9395e 100644 --- a/chrome/browser/ui/views/options/exceptions_page_view.cc +++ b/chrome/browser/ui/views/options/exceptions_page_view.cc @@ -14,7 +14,7 @@ #include "ui/base/text/text_elider.h" #include "views/background.h" #include "views/controls/button/native_button.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" using views::ColumnSet; diff --git a/chrome/browser/ui/views/options/exceptions_view.cc b/chrome/browser/ui/views/options/exceptions_view.cc index 0bb0341..a73e0d61 100644 --- a/chrome/browser/ui/views/options/exceptions_view.cc +++ b/chrome/browser/ui/views/options/exceptions_view.cc @@ -16,7 +16,7 @@ #include "views/controls/button/native_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/fonts_page_view.cc b/chrome/browser/ui/views/options/fonts_page_view.cc index d53d20a..4f0c900 100644 --- a/chrome/browser/ui/views/options/fonts_page_view.cc +++ b/chrome/browser/ui/views/options/fonts_page_view.cc @@ -29,7 +29,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/native_button.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc index 60f852d..43664e4 100644 --- a/chrome/browser/ui/views/options/general_page_view.cc +++ b/chrome/browser/ui/views/options/general_page_view.cc @@ -40,7 +40,7 @@ #include "views/controls/label.h" #include "views/controls/table/table_view.h" #include "views/controls/textfield/textfield.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" namespace { diff --git a/chrome/browser/ui/views/options/languages_page_view.cc b/chrome/browser/ui/views/options/languages_page_view.cc index 3f6d0f8..581f403 100644 --- a/chrome/browser/ui/views/options/languages_page_view.cc +++ b/chrome/browser/ui/views/options/languages_page_view.cc @@ -36,7 +36,7 @@ #include "views/controls/button/radio_button.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/table/table_view.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/options_group_view.cc b/chrome/browser/ui/views/options/options_group_view.cc index 845406c..cbf2c4a 100644 --- a/chrome/browser/ui/views/options/options_group_view.cc +++ b/chrome/browser/ui/views/options/options_group_view.cc @@ -18,7 +18,7 @@ #include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" #include "views/controls/separator.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" static const int kLeftColumnWidthChars = 20; diff --git a/chrome/browser/ui/views/options/passwords_page_view.cc b/chrome/browser/ui/views/options/passwords_page_view.cc index a04a05e..11a16d1 100644 --- a/chrome/browser/ui/views/options/passwords_page_view.cc +++ b/chrome/browser/ui/views/options/passwords_page_view.cc @@ -15,7 +15,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/background.h" #include "views/controls/button/native_button.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" using views::ColumnSet; diff --git a/chrome/browser/ui/views/options/plugin_filter_page_view.cc b/chrome/browser/ui/views/options/plugin_filter_page_view.cc index 6aa9578..eb4af2d 100644 --- a/chrome/browser/ui/views/options/plugin_filter_page_view.cc +++ b/chrome/browser/ui/views/options/plugin_filter_page_view.cc @@ -9,7 +9,7 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" PluginFilterPageView::PluginFilterPageView(Profile* profile) diff --git a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc index 8da55aa..fe7e36e 100644 --- a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc +++ b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc @@ -14,7 +14,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/button/native_button.h" #include "views/controls/table/table_view.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc index 92bc3d5..68dd9327 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info_bubble_view.cc @@ -19,7 +19,7 @@ #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/separator.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/widget/widget.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index 7cb9baa..755b178 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -16,7 +16,7 @@ #include "ui/base/l10n/l10n_util.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" UninstallView::UninstallView(int& user_selection) diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc index 05b430d..196ef70 100644 --- a/chrome/browser/ui/views/url_picker.cc +++ b/chrome/browser/ui/views/url_picker.cc @@ -25,7 +25,7 @@ #include "views/controls/table/table_view.h" #include "views/controls/textfield/textfield.h" #include "views/focus/focus_manager.h" -#include "views/grid_layout.h" +#include "views/layout/grid_layout.h" #include "views/layout/layout_constants.h" #include "views/widget/widget.h" |