diff options
63 files changed, 165 insertions, 168 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 5bad09c..56358f3 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -25,7 +25,7 @@ #include "chrome/browser/gtk/view_id_util.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/toolbar_model.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/common/notification_service.h" #include "gfx/font.h" #include "gfx/gtk_util.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h index 78c8302..feee937 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.h @@ -18,7 +18,7 @@ #include "base/string_util.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" #include "chrome/browser/gtk/owned_widget_gtk.h" -#include "chrome/browser/toolbar_model.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/page_transition_types.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm index b821f64..d84c05c 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm +++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm @@ -19,8 +19,8 @@ #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/toolbar_model.h" #include "chrome/browser/ui/cocoa/event_utils.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.h b/chrome/browser/autocomplete/autocomplete_edit_view_win.h index 3a9c0b2..457233e 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.h +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.h @@ -18,7 +18,7 @@ #include "base/scoped_ptr.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_edit_view.h" -#include "chrome/browser/toolbar_model.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" #include "chrome/common/page_transition_types.h" #include "gfx/font.h" diff --git a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc index c1a231c..e4b6117 100644 --- a/chrome/browser/chromeos/notifications/balloon_collection_impl.cc +++ b/chrome/browser/chromeos/notifications/balloon_collection_impl.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chromeos/notifications/notification_panel.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/notification.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/notification_service.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc index 3247430..6a6ac2b 100644 --- a/chrome/browser/chromeos/options/options_window_view.cc +++ b/chrome/browser/chromeos/options/options_window_view.cc @@ -6,9 +6,7 @@ #include "app/l10n_util.h" #include "base/scoped_ptr.h" -#include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/chromeos/options/internet_page_view.h" #include "chrome/browser/chromeos/options/system_page_view.h" #include "chrome/browser/gtk/options/advanced_page_gtk.h" @@ -16,9 +14,11 @@ #include "chrome/browser/gtk/options/general_page_gtk.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/accessible_view_helper.h" -#include "chrome/browser/views/window.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/views/accessible_view_helper.h" +#include "chrome/browser/ui/views/window.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/extensions/extension_popup_api.cc b/chrome/browser/extensions/extension_popup_api.cc index e57d1be..c237dc5 100644 --- a/chrome/browser/extensions/extension_popup_api.cc +++ b/chrome/browser/extensions/extension_popup_api.cc @@ -18,7 +18,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index 169cfff..5fd42ed 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -27,7 +27,7 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/gtk/back_forward_button_gtk.cc b/chrome/browser/gtk/back_forward_button_gtk.cc index 669b9d7..3e063eb 100644 --- a/chrome/browser/gtk/back_forward_button_gtk.cc +++ b/chrome/browser/gtk/back_forward_button_gtk.cc @@ -9,12 +9,12 @@ #include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/back_forward_menu_model.h" #include "chrome/browser/gtk/gtk_theme_provider.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/browser_titlebar.cc b/chrome/browser/gtk/browser_titlebar.cc index 71c8571..34055ca 100644 --- a/chrome/browser/gtk/browser_titlebar.cc +++ b/chrome/browser/gtk/browser_titlebar.cc @@ -18,7 +18,6 @@ #include "base/string_tokenizer.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/gtk/accelerators_gtk.h" #include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/custom_button.h" @@ -34,7 +33,8 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/wrench_menu_model.h" +#include "chrome/browser/ui/toolbar/encoding_menu_controller.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "gfx/gtk_util.h" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index bfcce1b..76ee177 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -18,7 +18,6 @@ #include "base/path_service.h" #include "base/singleton.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/gtk/accelerators_gtk.h" #include "chrome/browser/gtk/back_forward_button_gtk.h" #include "chrome/browser/gtk/browser_actions_toolbar_gtk.h" @@ -39,6 +38,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.h b/chrome/browser/gtk/browser_toolbar_gtk.h index dbcc97d..540dec1 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.h +++ b/chrome/browser/gtk/browser_toolbar_gtk.h @@ -20,7 +20,7 @@ #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/gtk/owned_widget_gtk.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/wrench_menu_model.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 38c81da..489f2b6 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -74,7 +74,7 @@ #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc index 8c7555c..f593fa4 100644 --- a/chrome/browser/gtk/options/options_window_gtk.cc +++ b/chrome/browser/gtk/options/options_window_gtk.cc @@ -10,9 +10,7 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "chrome/browser/accessibility_events.h" -#include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/gtk/accessible_widget_helper_gtk.h" #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/advanced_page_gtk.h" @@ -21,7 +19,9 @@ #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h index 1802441..c421d69 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h +++ b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h @@ -13,8 +13,8 @@ #include "app/x11_util.h" #include "base/scoped_ptr.h" #include "base/timer.h" -#include "chrome/browser/dock_info.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" +#include "chrome/browser/ui/tabs/dock_info.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/notifications/balloon_collection.cc b/chrome/browser/notifications/balloon_collection.cc index 9d60626..218126b 100644 --- a/chrome/browser/notifications/balloon_collection.cc +++ b/chrome/browser/notifications/balloon_collection.cc @@ -9,7 +9,7 @@ #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_host.h" #include "chrome/browser/notifications/notification.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" #include "gfx/rect.h" #include "gfx/size.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index d792d430..b1eb3f0 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -37,7 +37,6 @@ #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_toggle_action.h" #include "chrome/browser/debugger/devtools_window.h" -#include "chrome/browser/dock_info.h" #include "chrome/browser/dom_ui/filebrowse_ui.h" #include "chrome/browser/dom_ui/options/content_settings_handler.h" #include "chrome/browser/download/download_item.h" @@ -87,9 +86,10 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/tabs/dock_info.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/browser/web_applications/web_app.h" -#include "chrome/browser/window_sizer.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/content_restriction.h" diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index b5ff475..77c2146 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -29,7 +29,7 @@ #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/browser/toolbar_model.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/page_transition_types.h" diff --git a/chrome/browser/ui/cocoa/back_forward_menu_controller.h b/chrome/browser/ui/cocoa/back_forward_menu_controller.h index 6ec82f6..13bb585 100644 --- a/chrome/browser/ui/cocoa/back_forward_menu_controller.h +++ b/chrome/browser/ui/cocoa/back_forward_menu_controller.h @@ -10,7 +10,7 @@ #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" -#include "chrome/browser/back_forward_menu_model.h" +#include "chrome/browser/ui/toolbar/back_forward_menu_model.h" @class DelayedMenuButton; diff --git a/chrome/browser/ui/cocoa/back_forward_menu_controller.mm b/chrome/browser/ui/cocoa/back_forward_menu_controller.mm index a3e89b2..9db04cf 100644 --- a/chrome/browser/ui/cocoa/back_forward_menu_controller.mm +++ b/chrome/browser/ui/cocoa/back_forward_menu_controller.mm @@ -7,9 +7,9 @@ #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/back_forward_menu_model.h" #import "chrome/browser/ui/cocoa/delayedmenu_button.h" #import "chrome/browser/ui/cocoa/event_utils.h" +#include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index 82151f0..e96075a 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -15,8 +15,6 @@ #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/bookmarks/bookmark_editor.h" -#include "chrome/browser/dock_info.h" -#include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" @@ -57,7 +55,9 @@ #import "chrome/browser/ui/cocoa/tab_view.h" #import "chrome/browser/ui/cocoa/tabpose_window.h" #import "chrome/browser/ui/cocoa/toolbar_controller.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/tabs/dock_info.h" +#include "chrome/browser/ui/toolbar/encoding_menu_controller.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm b/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm index 9045540..44d66b1 100644 --- a/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm +++ b/chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm @@ -9,9 +9,9 @@ #include "base/string16.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/toolbar/encoding_menu_controller.h" namespace { diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 7675165d..d89ec36 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -18,7 +18,7 @@ #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/location_bar.h" -#include "chrome/browser/toolbar_model.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/common/content_settings_types.h" @class AutocompleteTextField; diff --git a/chrome/browser/ui/cocoa/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar_controller.mm index aa1d521..1383e08 100644 --- a/chrome/browser/ui/cocoa/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar_controller.mm @@ -22,9 +22,7 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/toolbar_model.h" #include "chrome/browser/upgrade_detector.h" -#include "chrome/browser/wrench_menu_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/accelerators_cocoa.h" @@ -43,6 +41,8 @@ #import "chrome/browser/ui/cocoa/toolbar_view.h" #import "chrome/browser/ui/cocoa/view_id_util.h" #import "chrome/browser/ui/cocoa/wrench_menu_controller.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu_controller.mm index d4a9872..3abd3aa 100644 --- a/chrome/browser/ui/cocoa/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu_controller.mm @@ -12,7 +12,7 @@ #import "chrome/browser/ui/cocoa/toolbar_controller.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/wrench_menu_model.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_source.h" diff --git a/chrome/browser/ui/cocoa/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu_controller_unittest.mm index 243b2af..42be865 100644 --- a/chrome/browser/ui/cocoa/wrench_menu_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/wrench_menu_controller_unittest.mm @@ -4,12 +4,12 @@ #include "base/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/wrench_menu_model.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/toolbar_controller.h" #import "chrome/browser/ui/cocoa/wrench_menu_controller.h" #import "chrome/browser/ui/cocoa/view_resizer_pong.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/dock_info.cc b/chrome/browser/ui/tabs/dock_info.cc index d52ddc9..97fe29d 100644 --- a/chrome/browser/dock_info.cc +++ b/chrome/browser/ui/tabs/dock_info.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/dock_info.h" +#include "chrome/browser/ui/tabs/dock_info.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/views/tabs/tab.h" diff --git a/chrome/browser/dock_info.h b/chrome/browser/ui/tabs/dock_info.h index d0bf90c..fa45b1a 100644 --- a/chrome/browser/dock_info.h +++ b/chrome/browser/ui/tabs/dock_info.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_DOCK_INFO_H_ -#define CHROME_BROWSER_DOCK_INFO_H_ +#ifndef CHROME_BROWSER_UI_TABS_DOCK_INFO_H_ +#define CHROME_BROWSER_UI_TABS_DOCK_INFO_H_ #pragma once #include <set> @@ -187,4 +187,4 @@ class DockInfo { static Factory* factory_; }; -#endif // CHROME_BROWSER_DOCK_INFO_H_ +#endif // CHROME_BROWSER_UI_TABS_DOCK_INFO_H_ diff --git a/chrome/browser/dock_info_gtk.cc b/chrome/browser/ui/tabs/dock_info_gtk.cc index 3b29395..3fb2778 100644 --- a/chrome/browser/dock_info_gtk.cc +++ b/chrome/browser/ui/tabs/dock_info_gtk.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/dock_info.h" +#include "chrome/browser/ui/tabs/dock_info.h" #include <gtk/gtk.h> #include "base/logging.h" #include "base/task.h" -#include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/gtk_util.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" #include "gfx/native_widget_types.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/dock_info_mac.cc b/chrome/browser/ui/tabs/dock_info_mac.cc index 7c4113c..5c2aeb7 100644 --- a/chrome/browser/dock_info_mac.cc +++ b/chrome/browser/ui/tabs/dock_info_mac.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/dock_info.h" +#include "chrome/browser/ui/tabs/dock_info.h" bool DockInfo::GetNewWindowBounds(gfx::Rect* new_window_bounds, bool* maximize_new_window) const { diff --git a/chrome/browser/dock_info_unittest.cc b/chrome/browser/ui/tabs/dock_info_unittest.cc index 1b6b3ef..ee4557e 100644 --- a/chrome/browser/dock_info_unittest.cc +++ b/chrome/browser/ui/tabs/dock_info_unittest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/basictypes.h" -#include "chrome/browser/dock_info.h" +#include "chrome/browser/ui/tabs/dock_info.h" #include "gfx/point.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/dock_info_win.cc b/chrome/browser/ui/tabs/dock_info_win.cc index b6fd04f..dee78cf 100644 --- a/chrome/browser/dock_info_win.cc +++ b/chrome/browser/ui/tabs/dock_info_win.cc @@ -2,12 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/dock_info.h" +#include "chrome/browser/ui/tabs/dock_info.h" -#include "base/basictypes.h" -#include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tabs/tab.h" diff --git a/chrome/browser/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 31595d5..5ea279f 100644 --- a/chrome/browser/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -4,7 +4,7 @@ #include "build/build_config.h" -#include "chrome/browser/back_forward_menu_model.h" +#include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "app/l10n_util.h" #include "app/text_elider.h" diff --git a/chrome/browser/back_forward_menu_model.h b/chrome/browser/ui/toolbar/back_forward_menu_model.h index b97698d..aba4688 100644 --- a/chrome/browser/back_forward_menu_model.h +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. -#ifndef CHROME_BROWSER_BACK_FORWARD_MENU_MODEL_H_ -#define CHROME_BROWSER_BACK_FORWARD_MENU_MODEL_H_ +#ifndef CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_ +#define CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_ #pragma once #include <string> @@ -168,4 +168,4 @@ class BackForwardMenuModel : public menus::MenuModel { DISALLOW_COPY_AND_ASSIGN(BackForwardMenuModel); }; -#endif // CHROME_BROWSER_BACK_FORWARD_MENU_MODEL_H_ +#endif // CHROME_BROWSER_UI_TOOLBAR_BACK_FORWARD_MENU_MODEL_H_ diff --git a/chrome/browser/back_forward_menu_model_unittest.cc b/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc index f6d2ea7..a25260d 100644 --- a/chrome/browser/back_forward_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model_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 "chrome/browser/back_forward_menu_model.h" +#include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome/browser/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc index 7d3a89e..96ac58f 100644 --- a/chrome/browser/encoding_menu_controller.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_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 "chrome/browser/encoding_menu_controller.h" +#include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include "app/l10n_util.h" #include "base/i18n/rtl.h" diff --git a/chrome/browser/encoding_menu_controller.h b/chrome/browser/ui/toolbar/encoding_menu_controller.h index fc907f8..bfa8c57 100644 --- a/chrome/browser/encoding_menu_controller.h +++ b/chrome/browser/ui/toolbar/encoding_menu_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 CHROME_BROWSER_ENCODING_MENU_CONTROLLER_H_ -#define CHROME_BROWSER_ENCODING_MENU_CONTROLLER_H_ +#ifndef CHROME_BROWSER_UI_TOOLBAR_ENCODING_MENU_CONTROLLER_H_ +#define CHROME_BROWSER_UI_TOOLBAR_ENCODING_MENU_CONTROLLER_H_ #pragma once #include <utility> @@ -53,4 +53,4 @@ class EncodingMenuController { DISALLOW_COPY_AND_ASSIGN(EncodingMenuController); }; -#endif // CHROME_BROWSER_ENCODING_MENU_CONTROLLER_H_ +#endif // CHROME_BROWSER_UI_TOOLBAR_ENCODING_MENU_CONTROLLER_H_ diff --git a/chrome/browser/encoding_menu_controller_unittest.cc b/chrome/browser/ui/toolbar/encoding_menu_controller_unittest.cc index ab8b6b5..2538547 100644 --- a/chrome/browser/encoding_menu_controller_unittest.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller_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 "chrome/browser/encoding_menu_controller.h" +#include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include <string> diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc index 6d55c65..b6533fd 100644 --- a/chrome/browser/toolbar_model.cc +++ b/chrome/browser/ui/toolbar/toolbar_model.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/toolbar_model.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" diff --git a/chrome/browser/toolbar_model.h b/chrome/browser/ui/toolbar/toolbar_model.h index 06050c1..d9ebec5 100644 --- a/chrome/browser/toolbar_model.h +++ b/chrome/browser/ui/toolbar/toolbar_model.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_TOOLBAR_MODEL_H__ -#define CHROME_BROWSER_TOOLBAR_MODEL_H__ +#ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_ +#define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_ #pragma once #include <string> @@ -68,4 +68,4 @@ class ToolbarModel { DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarModel); }; -#endif // CHROME_BROWSER_TOOLBAR_MODEL_H__ +#endif // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_MODEL_H_ diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 9c84667..6c83a00 100644 --- a/chrome/browser/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/wrench_menu_model.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include <algorithm> #include <cmath> @@ -19,7 +19,6 @@ #include "chrome/browser/background_page_tracker.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/defaults.h" -#include "chrome/browser/encoding_menu_controller.h" #include "chrome/browser/profile.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/sync/profile_sync_service.h" @@ -27,6 +26,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/toolbar/encoding_menu_controller.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/common/badge_util.h" #include "chrome/common/chrome_switches.h" @@ -44,7 +44,7 @@ #endif #if defined(OS_MACOSX) -#include "chrome/browser/browser_window.h" +#include "chrome/browser/ui/browser_window.h" #endif #if defined(OS_CHROMEOS) diff --git a/chrome/browser/wrench_menu_model.h b/chrome/browser/ui/toolbar/wrench_menu_model.h index 39f67b1..e984a4b 100644 --- a/chrome/browser/wrench_menu_model.h +++ b/chrome/browser/ui/toolbar/wrench_menu_model.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_WRENCH_MENU_MODEL_H_ -#define CHROME_BROWSER_WRENCH_MENU_MODEL_H_ +#ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ +#define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ #pragma once #include "app/menus/accelerator.h" @@ -146,4 +146,4 @@ class WrenchMenuModel : public menus::SimpleMenuModel, DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); }; -#endif // CHROME_BROWSER_WRENCH_MENU_MODEL_H_ +#endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ diff --git a/chrome/browser/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc index 188abf4..92a8125 100644 --- a/chrome/browser/wrench_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model_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 "chrome/browser/wrench_menu_model.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/test/browser_with_test_window_test.h" diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc index f7c4b1c..20812b8 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.cc +++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc @@ -16,14 +16,14 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_manager.h" #include "chrome/browser/autofill/phone_number.h" -#include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/list_background.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/views/list_background.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/notification_details.h" #include "chrome/common/pref_names.h" #include "gfx/canvas.h" diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc index d872ace..7ed8ef7 100644 --- a/chrome/browser/ui/views/chrome_views_delegate.cc +++ b/chrome/browser/ui/views/chrome_views_delegate.cc @@ -9,8 +9,8 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" -#include "chrome/browser/views/accessibility_event_router_views.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/views/accessibility_event_router_views.h" +#include "chrome/browser/ui/window_sizer.h" #include "gfx/rect.h" #if defined(OS_WIN) diff --git a/chrome/browser/ui/views/constrained_window_win.cc b/chrome/browser/ui/views/constrained_window_win.cc index 7fa1dc6..6079e0b 100644 --- a/chrome/browser/ui/views/constrained_window_win.cc +++ b/chrome/browser/ui/views/constrained_window_win.cc @@ -12,9 +12,9 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/browser/toolbar_model.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc index 454bd60..77bd298 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc @@ -4,8 +4,6 @@ #include "chrome/browser/views/extensions/extension_popup.h" -#include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_toggle_action.h" #include "chrome/browser/extensions/extension_host.h" @@ -14,8 +12,10 @@ #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index c7d9265..64ef258 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -20,7 +20,6 @@ #include "chrome/browser/autocomplete/autocomplete_popup_view.h" #include "chrome/browser/automation/ui_controls.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/dom_ui/bug_report_ui.h" @@ -41,25 +40,26 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" +#include "chrome/browser/ui/views/accessible_view_helper.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/browser_dialogs.h" +#include "chrome/browser/ui/views/default_search_view.h" +#include "chrome/browser/ui/views/download_shelf_view.h" +#include "chrome/browser/ui/views/frame/browser_view_layout.h" +#include "chrome/browser/ui/views/frame/contents_container.h" +#include "chrome/browser/ui/views/fullscreen_exit_bubble.h" +#include "chrome/browser/ui/views/status_bubble_views.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" +#include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h" +#include "chrome/browser/ui/views/tabs/side_tab_strip.h" +#include "chrome/browser/ui/views/theme_install_bubble_view.h" +#include "chrome/browser/ui/views/toolbar_view.h" +#include "chrome/browser/ui/views/update_recommended_message_box.h" +#include "chrome/browser/ui/views/window.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/browser/view_ids.h" -#include "chrome/browser/views/accessible_view_helper.h" -#include "chrome/browser/views/bookmark_bar_view.h" -#include "chrome/browser/views/browser_dialogs.h" -#include "chrome/browser/views/default_search_view.h" -#include "chrome/browser/views/download_shelf_view.h" -#include "chrome/browser/views/frame/browser_view_layout.h" -#include "chrome/browser/views/frame/contents_container.h" -#include "chrome/browser/views/fullscreen_exit_bubble.h" -#include "chrome/browser/views/status_bubble_views.h" -#include "chrome/browser/views/tab_contents/tab_contents_container.h" -#include "chrome/browser/views/tabs/browser_tab_strip_controller.h" -#include "chrome/browser/views/tabs/side_tab_strip.h" -#include "chrome/browser/views/theme_install_bubble_view.h" -#include "chrome/browser/views/toolbar_view.h" -#include "chrome/browser/views/update_recommended_message_box.h" -#include "chrome/browser/views/window.h" -#include "chrome/browser/window_sizer.h" -#include "chrome/browser/wrench_menu_model.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/native_window_notification_source.h" diff --git a/chrome/browser/ui/views/info_bubble.cc b/chrome/browser/ui/views/info_bubble.cc index befb716..d8a3306 100644 --- a/chrome/browser/ui/views/info_bubble.cc +++ b/chrome/browser/ui/views/info_bubble.cc @@ -6,7 +6,7 @@ #include "app/keyboard_codes.h" #include "app/slide_animation.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/notification_service.h" #include "gfx/canvas_skia.h" #include "gfx/color_utils.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h index 5e45e10..d83c7de 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -16,7 +16,7 @@ #include "chrome/browser/location_bar.h" #include "chrome/browser/search_engines/template_url_model_observer.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/toolbar_model.h" +#include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/views/extensions/extension_popup.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/ui/views/options/options_window_view.cc b/chrome/browser/ui/views/options/options_window_view.cc index 8201bd8..e52c8ae 100644 --- a/chrome/browser/ui/views/options/options_window_view.cc +++ b/chrome/browser/ui/views/options/options_window_view.cc @@ -6,15 +6,15 @@ #include "app/l10n_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/options/advanced_page_view.h" -#include "chrome/browser/views/options/content_page_view.h" -#include "chrome/browser/views/options/general_page_view.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/views/options/advanced_page_view.h" +#include "chrome/browser/ui/views/options/content_page_view.h" +#include "chrome/browser/ui/views/options/general_page_view.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.h b/chrome/browser/ui/views/tabs/dragged_tab_controller.h index 2d00ac6..f00a0ef 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.h +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.h @@ -9,9 +9,9 @@ #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/timer.h" -#include "chrome/browser/dock_info.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tabs/dock_info.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "gfx/rect.h" diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 43806a5..bc1e0a3 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -10,17 +10,17 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/accessibility/browser_accessibility_state.h" #include "chrome/browser/background_page_tracker.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/toolbar/wrench_menu_model.h" +#include "chrome/browser/ui/views/browser_actions_container.h" +#include "chrome/browser/ui/views/event_utils.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/browser/view_ids.h" -#include "chrome/browser/views/browser_actions_container.h" -#include "chrome/browser/views/event_utils.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/wrench_menu_model.h" #include "chrome/common/badge_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/views/toolbar_view.h b/chrome/browser/ui/views/toolbar_view.h index 3553ed2..e8c13af 100644 --- a/chrome/browser/ui/views/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar_view.h @@ -12,12 +12,12 @@ #include "app/slide_animation.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" -#include "chrome/browser/back_forward_menu_model.h" #include "chrome/browser/command_updater.h" #include "chrome/browser/prefs/pref_member.h" -#include "chrome/browser/views/accessible_pane_view.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" -#include "chrome/browser/views/reload_button.h" +#include "chrome/browser/ui/toolbar/back_forward_menu_model.h" +#include "chrome/browser/ui/views/accessible_pane_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/reload_button.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu.h" #include "views/controls/menu/menu_wrapper.h" diff --git a/chrome/browser/window_sizer.cc b/chrome/browser/ui/window_sizer.cc index e6c1b57..292f5fc 100644 --- a/chrome/browser/window_sizer.cc +++ b/chrome/browser/ui/window_sizer.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" -#include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" #include "chrome/common/pref_names.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/window_sizer.h b/chrome/browser/ui/window_sizer.h index d200d36..7d34399 100644 --- a/chrome/browser/window_sizer.h +++ b/chrome/browser/ui/window_sizer.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_WINDOW_SIZER_H_ -#define CHROME_BROWSER_WINDOW_SIZER_H_ +#ifndef CHROME_BROWSER_UI_WINDOW_SIZER_H_ +#define CHROME_BROWSER_UI_WINDOW_SIZER_H_ #pragma once #include <vector> diff --git a/chrome/browser/window_sizer_linux.cc b/chrome/browser/ui/window_sizer_linux.cc index 778a557..2d2dff6 100644 --- a/chrome/browser/window_sizer_linux.cc +++ b/chrome/browser/ui/window_sizer_linux.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 "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" #include <gtk/gtk.h> #include "base/logging.h" -#include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" // Used to pad the default new window size. On Windows, this is also used for // positioning new windows (each window is offset from the previous one). diff --git a/chrome/browser/window_sizer_mac.mm b/chrome/browser/ui/window_sizer_mac.mm index c303cc4..5d1bb66 100644 --- a/chrome/browser/window_sizer_mac.mm +++ b/chrome/browser/ui/window_sizer_mac.mm @@ -6,7 +6,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" // How much horizontal and vertical offset there is between newly diff --git a/chrome/browser/window_sizer_unittest.cc b/chrome/browser/ui/window_sizer_unittest.cc index 622d114..f11065f 100644 --- a/chrome/browser/window_sizer_unittest.cc +++ b/chrome/browser/ui/window_sizer_unittest.cc @@ -4,7 +4,7 @@ #include <vector> -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" #include "base/logging.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/window_sizer_win.cc b/chrome/browser/ui/window_sizer_win.cc index 0574a3d..a2952a40 100644 --- a/chrome/browser/window_sizer_win.cc +++ b/chrome/browser/ui/window_sizer_win.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/window_sizer.h" -#include "chrome/browser/browser_list.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/browser_window.h" // How much horizontal and vertical offset there is between newly // opened windows. diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 19eccfb..6bfd17a 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -260,8 +260,6 @@ 'browser/automation/ui_controls_mac.mm', 'browser/automation/ui_controls_win.cc', 'browser/automation/ui_controls.h', - 'browser/back_forward_menu_model.cc', - 'browser/back_forward_menu_model.h', 'browser/background_application_list_model.cc', 'browser/background_application_list_model.h', 'browser/background_contents_service.cc', @@ -818,11 +816,6 @@ 'browser/diagnostics/sqlite_diagnostics.h', 'browser/diagnostics/recon_diagnostics.cc', 'browser/diagnostics/recon_diagnostics.h', - 'browser/dock_info_gtk.cc', - 'browser/dock_info_mac.cc', - 'browser/dock_info_win.cc', - 'browser/dock_info.cc', - 'browser/dock_info.h', 'browser/dom_operation_notification_details.h', 'browser/dom_ui/app_launcher_handler.cc', 'browser/dom_ui/app_launcher_handler.h', @@ -997,8 +990,6 @@ 'browser/download/save_package.h', 'browser/download/save_types.cc', 'browser/download/save_types.h', - 'browser/encoding_menu_controller.cc', - 'browser/encoding_menu_controller.h', 'browser/extensions/convert_user_script.cc', 'browser/extensions/convert_user_script.h', 'browser/extensions/convert_web_app.cc', @@ -2527,8 +2518,6 @@ 'browser/themes/browser_theme_provider_mac.mm', 'browser/themes/browser_theme_provider.cc', 'browser/themes/browser_theme_provider.h', - 'browser/toolbar_model.cc', - 'browser/toolbar_model.h', 'browser/translate/languages_menu_model.cc', 'browser/translate/languages_menu_model.h', 'browser/translate/options_menu_model.cc', @@ -3022,6 +3011,19 @@ 'browser/ui/find_bar/find_bar_state.h', 'browser/ui/find_bar/find_bar_state.cc', 'browser/ui/find_bar/find_notification_details.h', + 'browser/ui/tabs/dock_info_gtk.cc', + 'browser/ui/tabs/dock_info_mac.cc', + 'browser/ui/tabs/dock_info_win.cc', + 'browser/ui/tabs/dock_info.cc', + 'browser/ui/tabs/dock_info.h', + 'browser/ui/toolbar/back_forward_menu_model.cc', + 'browser/ui/toolbar/back_forward_menu_model.h', + 'browser/ui/toolbar/encoding_menu_controller.cc', + 'browser/ui/toolbar/encoding_menu_controller.h', + 'browser/ui/toolbar/toolbar_model.cc', + 'browser/ui/toolbar/toolbar_model.h', + 'browser/ui/toolbar/wrench_menu_model.cc', + 'browser/ui/toolbar/wrench_menu_model.h', 'browser/ui/views/about_chrome_view.cc', 'browser/ui/views/about_chrome_view.h', 'browser/ui/views/about_ipc_dialog.cc', @@ -3383,6 +3385,11 @@ 'browser/ui/views/window.h', 'browser/ui/views/wrench_menu.cc', 'browser/ui/views/wrench_menu.h', + 'browser/ui/window_sizer.cc', + 'browser/ui/window_sizer.h', + 'browser/ui/window_sizer_mac.mm', + 'browser/ui/window_sizer_linux.cc', + 'browser/ui/window_sizer_win.cc', 'browser/upgrade_detector.cc', 'browser/upgrade_detector.h', 'browser/user_style_sheet_watcher.cc', @@ -3408,11 +3415,6 @@ 'browser/web_applications/web_app.h', 'browser/web_resource/web_resource_service.h', 'browser/web_resource/web_resource_service.cc', - 'browser/window_sizer.cc', - 'browser/window_sizer.h', - 'browser/window_sizer_mac.mm', - 'browser/window_sizer_linux.cc', - 'browser/window_sizer_win.cc', 'browser/worker_host/message_port_dispatcher.cc', 'browser/worker_host/message_port_dispatcher.h', 'browser/worker_host/worker_document_set.cc', @@ -3421,8 +3423,6 @@ 'browser/worker_host/worker_process_host.h', 'browser/worker_host/worker_service.cc', 'browser/worker_host/worker_service.h', - 'browser/wrench_menu_model.cc', - 'browser/wrench_menu_model.h', 'browser/zygote_host_linux.cc', 'browser/zygote_main_linux.cc', @@ -3601,7 +3601,7 @@ 'browser/bookmarks/bookmark_context_menu.cc', 'browser/bookmarks/bookmark_drop_info.cc', 'browser/ui/browser_list_stub.cc', - 'browser/dock_info.cc', + 'browser/ui/tabs/dock_info.cc', 'browser/importer/nss_decryptor_system_nss.cc', 'browser/importer/nss_decryptor_system_nss.h', 'browser/jankometer.cc', @@ -3825,10 +3825,6 @@ '<(INTERMEDIATE_DIR)/chrome', ], 'sources/': [ - ['include', '^browser/back_forward_menu_model_views.cc'], - ['include', '^browser/back_forward_menu_model_views.h'], - ['include', '^browser/dock_info.cc'], - ['include', '^browser/dock_info.h'], ['include', '^browser/extensions/'], # This exclude duplicates the one just above because of the # order of evaluation of the 'sources/' rule above, the @@ -3837,6 +3833,8 @@ ['include', 'browser/printing/print_dialog_cloud.cc'], ['include', 'browser/printing/print_dialog_cloud.h'], ['include', '^browser/speech/speech_input_bubble_views.cc'], + ['include', '^browser/ui/tabs/dock_info.cc'], + ['include', '^browser/ui/tabs/dock_info.h'], ['include', '^browser/ui/views/about_chrome_view.cc'], ['include', '^browser/ui/views/about_chrome_view.h'], ['include', '^browser/ui/views/accelerator_table_gtk.cc'], @@ -4055,8 +4053,8 @@ ['include', '^browser/ui/views/window.h'], ['include', '^browser/ui/views/wrench_menu.cc'], ['include', '^browser/ui/views/wrench_menu.h'], - ['include', '^browser/window_sizer.cc'], - ['include', '^browser/window_sizer.h'], + ['include', '^browser/ui/window_sizer.cc'], + ['include', '^browser/ui/window_sizer.h'], # Exclude all of browser/gtk, then include the things we want. ['exclude', '^browser/gtk'], ['include', '^browser/gtk/accessibility_event_router_gtk.cc'], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 8fe846c..1e8bcbd 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1043,7 +1043,6 @@ 'browser/autofill/phone_field_unittest.cc', 'browser/autofill/phone_number_unittest.cc', 'browser/automation/automation_provider_unittest.cc', - 'browser/back_forward_menu_model_unittest.cc', 'browser/background_contents_service_unittest.cc', 'browser/background_mode_manager_unittest.cc', 'browser/background_page_tracker_unittest.cc', @@ -1115,7 +1114,6 @@ 'browser/cookies_tree_model_unittest.cc', 'browser/debugger/devtools_manager_unittest.cc', 'browser/device_orientation/provider_unittest.cc', - 'browser/dock_info_unittest.cc', 'browser/dom_ui/dom_ui_theme_source_unittest.cc', 'browser/dom_ui/dom_ui_unittest.cc', 'browser/dom_ui/html_dialog_tab_contents_delegate_unittest.cc', @@ -1127,7 +1125,6 @@ 'browser/download/download_status_updater_unittest.cc', 'browser/download/download_util_unittest.cc', 'browser/download/save_package_unittest.cc', - 'browser/encoding_menu_controller_unittest.cc', 'browser/enumerate_modules_model_unittest_win.cc', 'browser/extensions/convert_user_script_unittest.cc', 'browser/extensions/convert_web_app_unittest.cc', @@ -1551,6 +1548,10 @@ 'browser/ui/cocoa/wrench_menu_button_cell_unittest.mm', 'browser/ui/cocoa/wrench_menu_controller_unittest.mm', 'browser/ui/find_bar/find_backend_unittest.cc', + 'browser/ui/tabs/dock_info_unittest.cc', + 'browser/ui/toolbar/back_forward_menu_model_unittest.cc', + 'browser/ui/toolbar/encoding_menu_controller_unittest.cc', + 'browser/ui/toolbar/wrench_menu_model_unittest.cc', 'browser/ui/views/accessibility_event_router_views_unittest.cc', 'browser/ui/views/bookmark_bar_view_unittest.cc', 'browser/ui/views/bookmark_context_menu_test.cc', @@ -1561,6 +1562,7 @@ 'browser/ui/views/reload_button_unittest.cc', 'browser/ui/views/shell_dialogs_win_unittest.cc', 'browser/ui/views/status_icons/status_tray_win_unittest.cc', + 'browser/ui/window_sizer_unittest.cc', 'browser/user_style_sheet_watcher_unittest.cc', 'browser/visitedlink_unittest.cc', 'browser/web_applications/web_app_unittest.cc', @@ -1568,8 +1570,6 @@ 'browser/webdata/web_data_service_unittest.cc', 'browser/webdata/web_database_unittest.cc', 'browser/web_resource/web_resource_service_unittest.cc', - 'browser/window_sizer_unittest.cc', - 'browser/wrench_menu_model_unittest.cc', 'common/bzip2_unittest.cc', 'common/child_process_logging_mac_unittest.mm', 'common/chrome_paths_unittest.cc', @@ -1765,7 +1765,7 @@ 'sources!': [ # Blocked on bookmark manager. 'browser/bookmarks/bookmark_context_menu_controller_unittest.cc', - 'browser/dock_info_unittest.cc', + 'browser/ui/tabs/dock_info_unittest.cc', 'browser/gtk/reload_button_gtk_unittest.cc', 'browser/password_manager/password_store_default_unittest.cc', 'tools/convert_dict/convert_dict_unittest.cc', diff --git a/chrome/test/plugin/pdf_browsertest.cc b/chrome/test/plugin/pdf_browsertest.cc index 07a2d17..52b4bee 100644 --- a/chrome/test/plugin/pdf_browsertest.cc +++ b/chrome/test/plugin/pdf_browsertest.cc @@ -9,11 +9,11 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/browser_window.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/window_sizer.h" +#include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_observer.h" |