diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 19:30:19 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 19:30:19 +0000 |
| commit | 6a3ec231b4a982787a4a1a5fd672bb974ce98bca (patch) | |
| tree | a63406d0cb3012ed4ab677598d4f2de9329e9f5a /chrome | |
| parent | 1ffacfd8a743eb9d375080db95d900166758551c (diff) | |
| download | chromium_src-6a3ec231b4a982787a4a1a5fd672bb974ce98bca.zip chromium_src-6a3ec231b4a982787a4a1a5fd672bb974ce98bca.tar.gz chromium_src-6a3ec231b4a982787a4a1a5fd672bb974ce98bca.tar.bz2 | |
Move:
tab_menu_model->ui/tabs
tab_contents_wrapper->ui/tab_contents
view_ids.h->ui
status_bubble.h->ui
options*->ui/options
show_options_url*->ui/options
location_bar*->ui/omnibox
input_window*->ui
browser_uitests->ui/tests
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/5582002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
176 files changed, 319 insertions, 324 deletions
diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc index d0c08c1..6844409 100644 --- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc @@ -9,10 +9,10 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/bookmark_bar_view.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/aeropeek_manager.cc b/chrome/browser/aeropeek_manager.cc index c79b538..f477381 100644 --- a/chrome/browser/aeropeek_manager.cc +++ b/chrome/browser/aeropeek_manager.cc @@ -24,8 +24,8 @@ #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/browser_distribution.h" diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 464d3c8..73ded8d 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -21,7 +21,6 @@ #include "chrome/browser/command_updater.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/print_job_manager.h" #include "chrome/browser/profile_manager.h" @@ -48,6 +47,7 @@ #import "chrome/browser/ui/cocoa/tab_strip_controller.h" #import "chrome/browser/ui/cocoa/tab_window_controller.h" #include "chrome/browser/ui/cocoa/task_manager_mac.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/common/app_mode_common_mac.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index 2828353..7f0900c 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc @@ -11,11 +11,11 @@ #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/history/history.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" #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/omnibox/location_bar.h" #include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc index d4496b3..4d25efc 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc @@ -19,12 +19,12 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/history/history.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index f76a1f7..284580e 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -63,7 +63,6 @@ #include "chrome/browser/importer/importer.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/io_thread.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/login_prompt.h" #include "chrome/browser/net/url_request_mock_util.h" #include "chrome/browser/platform_util.h" @@ -84,6 +83,7 @@ #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_notification_details.h" +#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/automation_constants.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/automation/automation_provider_mac.mm b/chrome/browser/automation/automation_provider_mac.mm index c8e8d31..f19bec2 100644 --- a/chrome/browser/automation/automation_provider_mac.mm +++ b/chrome/browser/automation/automation_provider_mac.mm @@ -13,7 +13,7 @@ #include "chrome/browser/automation/automation_window_tracker.h" #include "chrome/browser/ui/cocoa/tab_window_controller.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/common/automation_messages.h" #include "gfx/point.h" #include "gfx/rect.h" diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc index 779b6eb..4bed75b 100644 --- a/chrome/browser/automation/automation_provider_observers.cc +++ b/chrome/browser/automation/automation_provider_observers.cc @@ -42,10 +42,10 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/translate/page_translated_details.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/automation_constants.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 71e87947..ad79bef 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -39,7 +39,6 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/history/top_sites.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/login_prompt.h" #include "chrome/browser/notifications/balloon.h" #include "chrome/browser/notifications/balloon_collection.h" @@ -57,12 +56,13 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/interstitial_page.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h" #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h" #include "chrome/browser/ui/find_bar/find_bar.h" +#include "chrome/browser/ui/omnibox/location_bar.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/automation/testing_automation_provider_mac.mm b/chrome/browser/automation/testing_automation_provider_mac.mm index 3d8260a..094dfff 100644 --- a/chrome/browser/automation/testing_automation_provider_mac.mm +++ b/chrome/browser/automation/testing_automation_provider_mac.mm @@ -14,7 +14,7 @@ #include "chrome/browser/automation/automation_window_tracker.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/cocoa/tab_window_controller.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "grit/generated_resources.h" void TestingAutomationProvider::ActivateWindow(int handle) { diff --git a/chrome/browser/bookmarks/bookmark_folder_editor_controller.h b/chrome/browser/bookmarks/bookmark_folder_editor_controller.h index 9ab3c6d..fde7c68 100644 --- a/chrome/browser/bookmarks/bookmark_folder_editor_controller.h +++ b/chrome/browser/bookmarks/bookmark_folder_editor_controller.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "chrome/browser/bookmarks/base_bookmark_model_observer.h" -#include "chrome/browser/input_window_dialog.h" +#include "chrome/browser/ui/input_window_dialog.h" #include "gfx/native_widget_types.h" class Profile; diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 8e9856b..f401eae 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -18,7 +18,6 @@ #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/pinned_tab_codec.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" @@ -29,6 +28,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc index 13c6b94..fcea0633 100644 --- a/chrome/browser/browser_focus_uitest.cc +++ b/chrome/browser/browser_focus_uitest.cc @@ -18,7 +18,7 @@ #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/url_constants.h" #include "chrome/test/in_process_browser_test.h" diff --git a/chrome/browser/chromeos/metrics_cros_settings_provider.cc b/chrome/browser/chromeos/metrics_cros_settings_provider.cc index 9935b65..47759bc 100644 --- a/chrome/browser/chromeos/metrics_cros_settings_provider.cc +++ b/chrome/browser/chromeos/metrics_cros_settings_provider.cc @@ -9,7 +9,7 @@ #include "chrome/browser/chromeos/cros_settings.h" #include "chrome/browser/chromeos/cros_settings_names.h" #include "chrome/browser/chromeos/login/user_manager.h" -#include "chrome/browser/options_util.h" +#include "chrome/browser/ui/options/options_util.h" #include "chrome/installer/util/google_update_settings.h" #if defined(USE_LINUX_BREAKPAD) diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc index 6a6ac2b..1b909b0 100644 --- a/chrome/browser/chromeos/options/options_window_view.cc +++ b/chrome/browser/chromeos/options/options_window_view.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/options_window.h" - #include "app/l10n_util.h" #include "base/scoped_ptr.h" #include "chrome/browser/browser_process.h" @@ -16,6 +14,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/options/options_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" diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.cc b/chrome/browser/chromeos/tab_closeable_state_watcher.cc index 4972079..94aa3cc 100644 --- a/chrome/browser/chromeos/tab_closeable_state_watcher.cc +++ b/chrome/browser/chromeos/tab_closeable_state_watcher.cc @@ -10,8 +10,8 @@ #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/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/chromeos/view_ids.h b/chrome/browser/chromeos/view_ids.h index f8b2794..e32e94e 100644 --- a/chrome/browser/chromeos/view_ids.h +++ b/chrome/browser/chromeos/view_ids.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_CHROMEOS_VIEW_IDS_H_ #pragma once -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" // View ID used in ChromeOS. enum ChromeOSViewIds { diff --git a/chrome/browser/chromeos/wm_overview_controller.cc b/chrome/browser/chromeos/wm_overview_controller.cc index d4625de..b041bd7 100644 --- a/chrome/browser/chromeos/wm_overview_controller.cc +++ b/chrome/browser/chromeos/wm_overview_controller.cc @@ -19,9 +19,9 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/common/notification_service.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/debugger/devtools_http_protocol_handler.cc b/chrome/browser/debugger/devtools_http_protocol_handler.cc index 8c1bea9..69cdb48 100644 --- a/chrome/browser/debugger/devtools_http_protocol_handler.cc +++ b/chrome/browser/debugger/devtools_http_protocol_handler.cc @@ -15,10 +15,10 @@ #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/profile.h" -#include "chrome/browser/tab_contents_wrapper.h" #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/tab_contents/tab_contents_wrapper.h" #include "chrome/common/devtools_messages.h" #include "chrome/common/net/url_request_context_getter.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc index b18703c..5e85816 100644 --- a/chrome/browser/debugger/devtools_window.cc +++ b/chrome/browser/debugger/devtools_window.cc @@ -22,10 +22,10 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/debugger/inspectable_tab_proxy.cc b/chrome/browser/debugger/inspectable_tab_proxy.cc index 5dd734f..9aa0622 100644 --- a/chrome/browser/debugger/inspectable_tab_proxy.cc +++ b/chrome/browser/debugger/inspectable_tab_proxy.cc @@ -11,9 +11,9 @@ #include "chrome/browser/debugger/devtools_client_host.h" #include "chrome/browser/sessions/session_id.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/devtools_messages.h" DevToolsClientHostImpl::DevToolsClientHostImpl( diff --git a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc index 1ba3c5c..536f84d 100644 --- a/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc +++ b/chrome/browser/dom_ui/html_dialog_tab_contents_delegate.cc @@ -6,10 +6,10 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" // Incognito profiles are not long-lived, so we always want to store a // non-incognito profile. diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc index 91e7ffc..cad6fc2 100644 --- a/chrome/browser/dom_ui/options/advanced_options_handler.cc +++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc @@ -16,8 +16,6 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/browser/options_util.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" @@ -25,6 +23,8 @@ #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/ui/options/options_util.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/dom_ui/options/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc index d49a534..52aa04b 100644 --- a/chrome/browser/dom_ui/options/browser_options_handler.cc +++ b/chrome/browser/dom_ui/options/browser_options_handler.cc @@ -18,11 +18,11 @@ #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/installer/util/browser_distribution.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/dom_ui/options/options_managed_banner_handler.h b/chrome/browser/dom_ui/options/options_managed_banner_handler.h index 6c63484..9cfc5e9 100644 --- a/chrome/browser/dom_ui/options/options_managed_banner_handler.h +++ b/chrome/browser/dom_ui/options/options_managed_banner_handler.h @@ -8,7 +8,7 @@ #include "base/string16.h" #include "chrome/browser/policy/managed_prefs_banner_base.h" -#include "chrome/browser/options_window.h" +#include "chrome/browser/ui/options/options_window.h" class DOMUI; diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc index 8ef7524..d452219 100644 --- a/chrome/browser/dom_ui/options/personal_options_handler.cc +++ b/chrome/browser/dom_ui/options/personal_options_handler.cc @@ -21,13 +21,13 @@ #if defined(TOOLKIT_GTK) #include "chrome/browser/gtk/gtk_theme_provider.h" #endif // defined(TOOLKIT_GTK) -#include "chrome/browser/options_page_base.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/options/options_page_base.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "chrome/common/notification_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/extensions/execute_code_in_tab_function.cc b/chrome/browser/extensions/execute_code_in_tab_function.cc index 1659af3..203afd9 100644 --- a/chrome/browser/extensions/execute_code_in_tab_function.cc +++ b/chrome/browser/extensions/execute_code_in_tab_function.cc @@ -13,8 +13,8 @@ #include "chrome/browser/extensions/file_reader.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_error_utils.h" diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc index b49c1a9..1b1da87 100644 --- a/chrome/browser/extensions/extension_browser_event_router.cc +++ b/chrome/browser/extensions/extension_browser_event_router.cc @@ -13,10 +13,9 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index ae90a66..f634b9d 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -16,9 +16,9 @@ #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/extensions/extension_browsertests_misc.cc b/chrome/browser/extensions/extension_browsertests_misc.cc index 4787fc5..6d227ed 100644 --- a/chrome/browser/extensions/extension_browsertests_misc.cc +++ b/chrome/browser/extensions/extension_browsertests_misc.cc @@ -19,9 +19,9 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/extensions/extension_clipboard_api.cc b/chrome/browser/extensions/extension_clipboard_api.cc index f80be6b..8cde22f 100644 --- a/chrome/browser/extensions/extension_clipboard_api.cc +++ b/chrome/browser/extensions/extension_clipboard_api.cc @@ -9,7 +9,7 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension_error_utils.h" namespace { diff --git a/chrome/browser/extensions/extension_cookies_helpers.cc b/chrome/browser/extensions/extension_cookies_helpers.cc index a140c8e..cdfdf76 100644 --- a/chrome/browser/extensions/extension_cookies_helpers.cc +++ b/chrome/browser/extensions/extension_cookies_helpers.cc @@ -12,8 +12,8 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/profile.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/extensions/extension_devtools_bridge.cc b/chrome/browser/extensions/extension_devtools_bridge.cc index 3a8f525..bfe6ae1 100644 --- a/chrome/browser/extensions/extension_devtools_bridge.cc +++ b/chrome/browser/extensions/extension_devtools_bridge.cc @@ -14,7 +14,7 @@ #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/devtools_messages.h" ExtensionDevToolsBridge::ExtensionDevToolsBridge(int tab_id, diff --git a/chrome/browser/extensions/extension_infobar_module.cc b/chrome/browser/extensions/extension_infobar_module.cc index 21d94ae..707630c 100644 --- a/chrome/browser/extensions/extension_infobar_module.cc +++ b/chrome/browser/extensions/extension_infobar_module.cc @@ -14,8 +14,8 @@ #include "chrome/browser/extensions/extension_tabs_module_constants.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc index 67c6e71..1162dc8 100644 --- a/chrome/browser/extensions/extension_message_service.cc +++ b/chrome/browser/extensions/extension_message_service.cc @@ -16,7 +16,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/extensions/extension_omnibox_apitest.cc b/chrome/browser/extensions/extension_omnibox_apitest.cc index 854662d..83514a9 100644 --- a/chrome/browser/extensions/extension_omnibox_apitest.cc +++ b/chrome/browser/extensions/extension_omnibox_apitest.cc @@ -12,11 +12,11 @@ #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/extensions/extension_apitest.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/extensions/extension_page_actions_module.cc b/chrome/browser/extensions/extension_page_actions_module.cc index c9dc2a3..8e3565f 100644 --- a/chrome/browser/extensions/extension_page_actions_module.cc +++ b/chrome/browser/extensions/extension_page_actions_module.cc @@ -12,8 +12,8 @@ #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_error_utils.h" diff --git a/chrome/browser/extensions/extension_processes_api.cc b/chrome/browser/extensions/extension_processes_api.cc index 99b72e8..732e138 100644 --- a/chrome/browser/extensions/extension_processes_api.cc +++ b/chrome/browser/extensions/extension_processes_api.cc @@ -19,8 +19,8 @@ #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/task_manager/task_manager.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/extensions/extension_sidebar_api.cc b/chrome/browser/extensions/extension_sidebar_api.cc index 5495a8e..e672052 100644 --- a/chrome/browser/extensions/extension_sidebar_api.cc +++ b/chrome/browser/extensions/extension_sidebar_api.cc @@ -16,7 +16,7 @@ #include "chrome/browser/sidebar/sidebar_container.h" #include "chrome/browser/sidebar/sidebar_manager.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_error_utils.h" diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/extension_tabs_module.cc index 2b905c2..74b7247 100644 --- a/chrome/browser/extensions/extension_tabs_module.cc +++ b/chrome/browser/extensions/extension_tabs_module.cc @@ -23,10 +23,10 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_error_utils.h" diff --git a/chrome/browser/extensions/page_action_apitest.cc b/chrome/browser/extensions/page_action_apitest.cc index dede04b..d819819 100644 --- a/chrome/browser/extensions/page_action_apitest.cc +++ b/chrome/browser/extensions/page_action_apitest.cc @@ -6,11 +6,11 @@ #include "chrome/browser/extensions/extension_browser_event_router.h" #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 489f2b6..ca6237b 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -62,18 +62,18 @@ #include "chrome/browser/gtk/task_manager_gtk.h" #include "chrome/browser/gtk/theme_install_bubble_view_gtk.h" #include "chrome/browser/gtk/update_recommended_dialog.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/page_info_window.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/tabs/tab_strip_model.h" #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/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/omnibox/location_bar.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/native_web_keyboard_event.h" diff --git a/chrome/browser/gtk/instant_confirm_dialog_gtk.cc b/chrome/browser/gtk/instant_confirm_dialog_gtk.cc index ab083b7..dfa0d90 100644 --- a/chrome/browser/gtk/instant_confirm_dialog_gtk.cc +++ b/chrome/browser/gtk/instant_confirm_dialog_gtk.cc @@ -12,7 +12,7 @@ #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/profile.h" -#include "chrome/browser/show_options_url.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc index 6447df6..d3d98b7 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/gtk/location_bar_view_gtk.cc @@ -39,12 +39,12 @@ #include "chrome/browser/gtk/rounded_window.h" #include "chrome/browser/gtk/view_id_util.h" #include "chrome/browser/instant/instant_controller.h" -#include "chrome/browser/location_bar_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/omnibox/location_bar_util.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" diff --git a/chrome/browser/gtk/location_bar_view_gtk.h b/chrome/browser/gtk/location_bar_view_gtk.h index 566886f..8c7dc07 100644 --- a/chrome/browser/gtk/location_bar_view_gtk.h +++ b/chrome/browser/gtk/location_bar_view_gtk.h @@ -23,7 +23,7 @@ #include "chrome/browser/gtk/info_bubble_gtk.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/browser/gtk/owned_widget_gtk.h" -#include "chrome/browser/location_bar.h" +#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc index ed8df68..fc61876 100644 --- a/chrome/browser/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc @@ -33,14 +33,14 @@ #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/content_settings_window_gtk.h" #include "chrome/browser/gtk/options/options_layout_gtk.h" -#include "chrome/browser/options_page_base.h" -#include "chrome/browser/options_util.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_set_observer.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" -#include "chrome/browser/show_options_url.h" +#include "chrome/browser/ui/options/options_page_base.h" +#include "chrome/browser/ui/options/options_util.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/gtk/options/advanced_page_gtk.cc b/chrome/browser/gtk/options/advanced_page_gtk.cc index 8351322..0f404a3 100644 --- a/chrome/browser/gtk/options/advanced_page_gtk.cc +++ b/chrome/browser/gtk/options/advanced_page_gtk.cc @@ -6,8 +6,8 @@ #include "app/l10n_util.h" #include "chrome/browser/gtk/gtk_util.h" -#include "chrome/browser/options_util.h" #include "chrome/browser/profile.h" +#include "chrome/browser/ui/options/options_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/options/advanced_page_gtk.h b/chrome/browser/gtk/options/advanced_page_gtk.h index 193a6d6..f1345c8 100644 --- a/chrome/browser/gtk/options/advanced_page_gtk.h +++ b/chrome/browser/gtk/options/advanced_page_gtk.h @@ -11,8 +11,8 @@ #include "app/gtk_signal.h" #include "chrome/browser/gtk/options/advanced_contents_gtk.h" #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/options/options_page_base.h" class Profile; diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.cc b/chrome/browser/gtk/options/content_filter_page_gtk.cc index d9b06a9..1e9172b 100644 --- a/chrome/browser/gtk/options/content_filter_page_gtk.cc +++ b/chrome/browser/gtk/options/content_filter_page_gtk.cc @@ -19,8 +19,8 @@ #include "chrome/browser/gtk/options/simple_content_exceptions_window.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/notifications/notification_exceptions_table_model.h" -#include "chrome/browser/show_options_url.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/gtk/options/content_filter_page_gtk.h b/chrome/browser/gtk/options/content_filter_page_gtk.h index 3b7bdec..d5d3de2 100644 --- a/chrome/browser/gtk/options/content_filter_page_gtk.h +++ b/chrome/browser/gtk/options/content_filter_page_gtk.h @@ -10,7 +10,7 @@ #include "app/gtk_signal.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/options_page_base.h" +#include "chrome/browser/ui/options/options_page_base.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/gtk/options/content_page_gtk.h b/chrome/browser/gtk/options/content_page_gtk.h index 286e28c..3ca408b 100644 --- a/chrome/browser/gtk/options/content_page_gtk.h +++ b/chrome/browser/gtk/options/content_page_gtk.h @@ -11,10 +11,10 @@ #include "app/gtk_signal.h" #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/profile_sync_service.h" +#include "chrome/browser/ui/options/options_page_base.h" class ContentPageGtk : public OptionsPageBase, public ProfileSyncServiceObserver { diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc index 955a200..9d3eb41 100644 --- a/chrome/browser/gtk/options/cookie_filter_page_gtk.cc +++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.cc @@ -15,8 +15,8 @@ #include "chrome/browser/gtk/options/content_exceptions_window_gtk.h" #include "chrome/browser/gtk/options/cookies_view.h" #include "chrome/browser/profile.h" -#include "chrome/browser/show_options_url.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/options/cookie_filter_page_gtk.h b/chrome/browser/gtk/options/cookie_filter_page_gtk.h index 36b7181..f07cbdb 100644 --- a/chrome/browser/gtk/options/cookie_filter_page_gtk.h +++ b/chrome/browser/gtk/options/cookie_filter_page_gtk.h @@ -12,8 +12,8 @@ #include "app/gtk_signal.h" #include "chrome/browser/content_settings/host_content_settings_map.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/options/options_page_base.h" class Profile; diff --git a/chrome/browser/gtk/options/fonts_page_gtk.h b/chrome/browser/gtk/options/fonts_page_gtk.h index fc87863..3dbdf5a 100644 --- a/chrome/browser/gtk/options/fonts_page_gtk.h +++ b/chrome/browser/gtk/options/fonts_page_gtk.h @@ -14,8 +14,8 @@ #include "app/gtk_signal.h" #include "base/scoped_ptr.h" #include "chrome/browser/character_encoding.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/options/options_page_base.h" class DefaultEncodingComboboxModel; diff --git a/chrome/browser/gtk/options/general_page_gtk.cc b/chrome/browser/gtk/options/general_page_gtk.cc index ca34c7f..6f040ac 100644 --- a/chrome/browser/gtk/options/general_page_gtk.cc +++ b/chrome/browser/gtk/options/general_page_gtk.cc @@ -27,7 +27,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/show_options_url.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/gtk/options/general_page_gtk.h b/chrome/browser/gtk/options/general_page_gtk.h index 0050b2b..05dac88 100644 --- a/chrome/browser/gtk/options/general_page_gtk.h +++ b/chrome/browser/gtk/options/general_page_gtk.h @@ -13,11 +13,11 @@ #include "app/gtk_signal.h" #include "chrome/browser/gtk/gtk_tree.h" #include "chrome/browser/gtk/options/managed_prefs_banner_gtk.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/search_engines/template_url_model_observer.h" #include "chrome/browser/shell_integration.h" +#include "chrome/browser/ui/options/options_page_base.h" #include "googleurl/src/gurl.h" class AccessibleWidgetHelper; diff --git a/chrome/browser/gtk/options/languages_page_gtk.h b/chrome/browser/gtk/options/languages_page_gtk.h index 81712be..5fb41bb 100644 --- a/chrome/browser/gtk/options/languages_page_gtk.h +++ b/chrome/browser/gtk/options/languages_page_gtk.h @@ -21,8 +21,8 @@ #include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" #include "chrome/browser/gtk/gtk_tree.h" -#include "chrome/browser/options_page_base.h" #include "chrome/browser/prefs/pref_member.h" +#include "chrome/browser/ui/options/options_page_base.h" class LanguageComboboxModel; class LanguageOrderTableModel; diff --git a/chrome/browser/gtk/options/options_window_gtk.cc b/chrome/browser/gtk/options/options_window_gtk.cc index f593fa4..33aa1c6 100644 --- a/chrome/browser/gtk/options/options_window_gtk.cc +++ b/chrome/browser/gtk/options/options_window_gtk.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/options_window.h" - #include <gtk/gtk.h> #include "app/l10n_util.h" @@ -21,6 +19,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc index 33fa5b3..ac973b0 100644 --- a/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc +++ b/chrome/browser/gtk/options/passwords_exceptions_window_gtk.cc @@ -15,8 +15,8 @@ #include "chrome/browser/gtk/gtk_util.h" #include "chrome/browser/gtk/options/passwords_exceptions_page_gtk.h" #include "chrome/browser/gtk/options/passwords_page_gtk.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/profile.h" +#include "chrome/browser/ui/options/options_window.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/gtk/status_bubble_gtk.h b/chrome/browser/gtk/status_bubble_gtk.h index b951b79..48354ed 100644 --- a/chrome/browser/gtk/status_bubble_gtk.h +++ b/chrome/browser/gtk/status_bubble_gtk.h @@ -15,7 +15,7 @@ #include "base/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/gtk/owned_widget_gtk.h" -#include "chrome/browser/status_bubble.h" +#include "chrome/browser/ui/status_bubble.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "gfx/point.h" diff --git a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc index 00546c6..6e487fb 100644 --- a/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc +++ b/chrome/browser/gtk/tabs/dragged_tab_controller_gtk.cc @@ -13,9 +13,9 @@ #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/notification_service.h" namespace { diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc index b61c967..958498d 100644 --- a/chrome/browser/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_gtk.cc @@ -13,7 +13,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/gtk/accelerators_gtk.h" #include "chrome/browser/gtk/menu_gtk.h" -#include "chrome/browser/tab_menu_model.h" +#include "chrome/browser/ui/tabs/tab_menu_model.h" #include "gfx/path.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 0960cec..00ef206 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -20,11 +20,11 @@ #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model_delegate.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "gfx/gtk_util.h" diff --git a/chrome/browser/gtk/view_id_util.h b/chrome/browser/gtk/view_id_util.h index c4833ad..0be817e 100644 --- a/chrome/browser/gtk/view_id_util.h +++ b/chrome/browser/gtk/view_id_util.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_GTK_VIEW_ID_UTIL_H_ #pragma once -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" typedef struct _GtkWidget GtkWidget; diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc index 91b7317..1dbadcc 100644 --- a/chrome/browser/history/redirect_uitest.cc +++ b/chrome/browser/history/redirect_uitest.cc @@ -14,7 +14,7 @@ #include "base/string_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" diff --git a/chrome/browser/instant/instant_browsertest.cc b/chrome/browser/instant/instant_browsertest.cc index 02d25ad..8a79e25 100644 --- a/chrome/browser/instant/instant_browsertest.cc +++ b/chrome/browser/instant/instant_browsertest.cc @@ -10,14 +10,14 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_window.h" #include "chrome/browser/instant/instant_controller.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/omnibox/location_bar.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index 8a71266..c2e6367 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -20,7 +20,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 66decac..5e78b5a 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -26,7 +26,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/instant/instant_loader_manager.cc b/chrome/browser/instant/instant_loader_manager.cc index f2bdd9f..8c3c17c 100644 --- a/chrome/browser/instant/instant_loader_manager.cc +++ b/chrome/browser/instant/instant_loader_manager.cc @@ -8,7 +8,7 @@ #include "chrome/browser/instant/instant_loader.h" #include "chrome/browser/instant/instant_loader_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" InstantLoaderManager::InstantLoaderManager( InstantLoaderDelegate* loader_delegate) diff --git a/chrome/browser/login_prompt.cc b/chrome/browser/login_prompt.cc index 47346c0..f36c6e6 100644 --- a/chrome/browser/login_prompt.cc +++ b/chrome/browser/login_prompt.cc @@ -18,7 +18,7 @@ #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index 42cbe63..5fab6a85 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -15,13 +15,13 @@ #include "chrome/browser/autocomplete/autocomplete_match.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" diff --git a/chrome/browser/oom_priority_manager.cc b/chrome/browser/oom_priority_manager.cc index 446f108..160f511 100644 --- a/chrome/browser/oom_priority_manager.cc +++ b/chrome/browser/oom_priority_manager.cc @@ -14,8 +14,8 @@ #include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/zygote_host_linux.h" #if !defined(OS_CHROMEOS) diff --git a/chrome/browser/policy/managed_prefs_banner_base.h b/chrome/browser/policy/managed_prefs_banner_base.h index e087cb1..40b798e 100644 --- a/chrome/browser/policy/managed_prefs_banner_base.h +++ b/chrome/browser/policy/managed_prefs_banner_base.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "chrome/browser/options_window.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/common/notification_observer.h" class PrefService; diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc index 69a5763..6888f5b 100644 --- a/chrome/browser/printing/print_preview_tab_controller.cc +++ b/chrome/browser/printing/print_preview_tab_controller.cc @@ -6,11 +6,11 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index a2a8db2..fb46b45 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -9,10 +9,10 @@ #include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/pref_names.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 98b6046..3d091b4 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -9,7 +9,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/profile.h" #include "chrome/browser/sync/profile_sync_service.h" -#include "chrome/browser/options_window.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/common/net/gaia/google_service_auth_error.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/tabs/pinned_tab_codec.cc b/chrome/browser/tabs/pinned_tab_codec.cc index 08264b2..b59b813 100644 --- a/chrome/browser/tabs/pinned_tab_codec.cc +++ b/chrome/browser/tabs/pinned_tab_codec.cc @@ -9,9 +9,9 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc index 1a9ac8f..12be6d7 100644 --- a/chrome/browser/tabs/tab_strip_model.cc +++ b/chrome/browser/tabs/tab_strip_model.cc @@ -21,11 +21,11 @@ #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/tabs/tab_strip_model_delegate.h" #include "chrome/browser/tabs/tab_strip_model_order_controller.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" diff --git a/chrome/browser/tabs/tab_strip_model_order_controller.cc b/chrome/browser/tabs/tab_strip_model_order_controller.cc index 7cadbf7..c7d10f4 100644 --- a/chrome/browser/tabs/tab_strip_model_order_controller.cc +++ b/chrome/browser/tabs/tab_strip_model_order_controller.cc @@ -4,7 +4,7 @@ #include "chrome/browser/tabs/tab_strip_model_order_controller.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" /////////////////////////////////////////////////////////////////////////////// // TabStripModelOrderController, public: diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc index 576085d..b0d9dc7 100644 --- a/chrome/browser/tabs/tab_strip_model_unittest.cc +++ b/chrome/browser/tabs/tab_strip_model_unittest.cc @@ -21,11 +21,11 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/tabs/tab_strip_model_delegate.h" #include "chrome/browser/tabs/tab_strip_model_order_controller.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_registrar.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index b1eb3f0..0a375ea 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -57,11 +57,9 @@ #include "chrome/browser/google/google_util.h" #include "chrome/browser/host_zoom_map.h" #include "chrome/browser/instant/instant_controller.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/browser_url_util.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" @@ -71,7 +69,6 @@ #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sessions/tab_restore_service.h" -#include "chrome/browser/status_bubble.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/tab_closeable_state_watcher.h" @@ -80,13 +77,16 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/browser/tab_contents_wrapper.h" -#include "chrome/browser/tab_menu_model.h" #include "chrome/browser/tabs/tab_strip_model.h" #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/omnibox/location_bar.h" +#include "chrome/browser/ui/options/options_window.h" +#include "chrome/browser/ui/status_bubble.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tabs/dock_info.h" +#include "chrome/browser/ui/tabs/tab_menu_model.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/browser/upgrade_detector.h" #include "chrome/browser/web_applications/web_app.h" @@ -122,8 +122,8 @@ #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/shell_integration.h" #include "chrome/browser/task_manager/task_manager.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #endif // OS_WIN #if defined(OS_MACOSX) diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 2bd55dc..ff62f6f 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -49,10 +49,10 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/pinned_tab_codec.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index f548099..72d9d54 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -8,14 +8,14 @@ #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_url_handler.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/site_instance.h" -#include "chrome/browser/status_bubble.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/status_bubble.h" +#include "chrome/browser/ui/omnibox/location_bar.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 299974d..87d38e5 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -6,12 +6,12 @@ #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/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm index d5c2fa9..6a7ee4a 100644 --- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm @@ -12,7 +12,6 @@ #import "chrome/browser/chrome_browser_application_mac.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" @@ -21,6 +20,7 @@ #include "chrome/browser/ui/cocoa/applescript/constants_applescript.h" #include "chrome/browser/ui/cocoa/applescript/error_applescript.h" #import "chrome/browser/ui/cocoa/applescript/tab_applescript.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/url_constants.h" @interface WindowAppleScript(WindowAppleScriptPrivateMethods) diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm index e8ebaec..5e8b0f2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -9,10 +9,10 @@ #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "grit/generated_resources.h" @implementation BookmarkAllTabsController diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 003fec7..08bdea0 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -19,7 +19,6 @@ #include "chrome/browser/sidebar/sidebar_container.h" #include "chrome/browser/sidebar/sidebar_manager.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" @@ -41,6 +40,7 @@ #include "chrome/browser/ui/cocoa/task_manager_mac.h" #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" #import "chrome/browser/ui/cocoa/toolbar_controller.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index e96075a..a7ba862 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -16,14 +16,12 @@ #include "chrome/app/chrome_command_ids.h" // IDC_* #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/google/google_util.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util_mac.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view_mac.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" @@ -55,6 +53,8 @@ #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/ui/omnibox/location_bar.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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" diff --git a/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm b/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm index a16f5e1..744a26e 100644 --- a/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm +++ b/chrome/browser/ui/cocoa/instant_confirm_window_controller.mm @@ -9,7 +9,7 @@ #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/profile.h" -#include "chrome/browser/show_options_url.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "gfx/native_widget_types.h" #include "googleurl/src/gurl.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" 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 d89ec36..2bf4f8c 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 @@ -17,7 +17,7 @@ #include "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #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/ui/omnibox/location_bar.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/common/content_settings_types.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 6fbac24..4ed6ba2 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -25,7 +25,6 @@ #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/instant/instant_controller.h" -#include "chrome/browser/location_bar_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" @@ -45,6 +44,7 @@ #import "chrome/browser/ui/cocoa/location_bar/page_action_decoration.h" #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" +#include "chrome/browser/ui/omnibox/location_bar_util.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm index 0bdd8e15..6aa6505 100644 --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm @@ -7,8 +7,8 @@ #include "app/l10n_util_mac.h" #include "base/utf_string_conversions.h" #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" -#include "chrome/browser/location_bar_util.h" #import "chrome/browser/ui/cocoa/image_utils.h" +#include "chrome/browser/ui/omnibox/location_bar_util.h" #include "grit/theme_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/cocoa/preferences_window_controller.h b/chrome/browser/ui/cocoa/preferences_window_controller.h index cfec955..9cd3190 100644 --- a/chrome/browser/ui/cocoa/preferences_window_controller.h +++ b/chrome/browser/ui/cocoa/preferences_window_controller.h @@ -6,10 +6,10 @@ #include "base/scoped_ptr.h" #include "base/scoped_nsobject.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_set_observer.h" #include "chrome/browser/prefs/pref_change_registrar.h" +#include "chrome/browser/ui/options/options_window.h" namespace PreferencesWindowControllerInternal { class PrefObserverBridge; diff --git a/chrome/browser/ui/cocoa/preferences_window_controller.mm b/chrome/browser/ui/cocoa/preferences_window_controller.mm index de8459a..e255f62 100644 --- a/chrome/browser/ui/cocoa/preferences_window_controller.mm +++ b/chrome/browser/ui/cocoa/preferences_window_controller.mm @@ -28,15 +28,12 @@ #include "chrome/browser/metrics/metrics_service.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/browser/options_util.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/policy/managed_prefs_banner_base.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/session_startup_pref.h" #include "chrome/browser/profile.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/shell_integration.h" -#include "chrome/browser/show_options_url.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -52,6 +49,9 @@ #import "chrome/browser/ui/cocoa/search_engine_list_model.h" #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" #import "chrome/browser/ui/cocoa/window_size_autosaver.h" +#include "chrome/browser/ui/options/options_util.h" +#include "chrome/browser/ui/options/options_window.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_observer.h" diff --git a/chrome/browser/ui/cocoa/preferences_window_controller_unittest.mm b/chrome/browser/ui/cocoa/preferences_window_controller_unittest.mm index 91993c2..bbb1746 100644 --- a/chrome/browser/ui/cocoa/preferences_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/preferences_window_controller_unittest.mm @@ -5,11 +5,11 @@ #import <Cocoa/Cocoa.h> #import "base/scoped_nsobject.h" -#include "chrome/browser/options_window.h" #import "chrome/browser/ui/cocoa/preferences_window_controller.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/custom_home_pages_model.h" +#include "chrome/browser/ui/options/options_window.h" #include "chrome/common/pref_names.h" #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.h b/chrome/browser/ui/cocoa/status_bubble_mac.h index d32f67c..091fdc1 100644 --- a/chrome/browser/ui/cocoa/status_bubble_mac.h +++ b/chrome/browser/ui/cocoa/status_bubble_mac.h @@ -13,7 +13,7 @@ #include "base/string16.h" #include "base/task.h" -#include "chrome/browser/status_bubble.h" +#include "chrome/browser/ui/status_bubble.h" #include "googleurl/src/gurl.h" class GURL; diff --git a/chrome/browser/ui/cocoa/tab_controller.h b/chrome/browser/ui/cocoa/tab_controller.h index c85bb62..bd515bd 100644 --- a/chrome/browser/ui/cocoa/tab_controller.h +++ b/chrome/browser/ui/cocoa/tab_controller.h @@ -7,8 +7,8 @@ #pragma once #import <Cocoa/Cocoa.h> -#include "chrome/browser/tab_menu_model.h" #import "chrome/browser/ui/cocoa/hover_close_button.h" +#include "chrome/browser/ui/tabs/tab_menu_model.h" // The loading/waiting state of the tab. enum TabLoadingState { diff --git a/chrome/browser/ui/cocoa/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tab_strip_controller.mm index 46b7395..0b18213 100644 --- a/chrome/browser/ui/cocoa/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tab_strip_controller.mm @@ -25,7 +25,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" @@ -40,6 +39,7 @@ #import "chrome/browser/ui/cocoa/throbber_view.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/cocoa/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tab_strip_controller_unittest.mm index 19a781c..189e57b 100644 --- a/chrome/browser/ui/cocoa/tab_strip_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/tab_strip_controller_unittest.mm @@ -6,13 +6,13 @@ #import "chrome/browser/browser_window.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/new_tab_button.h" #import "chrome/browser/ui/cocoa/tab_strip_controller.h" #import "chrome/browser/ui/cocoa/tab_strip_view.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/tabpose_window.mm b/chrome/browser/ui/cocoa/tabpose_window.mm index 47825f5..eb64972 100644 --- a/chrome/browser/ui/cocoa/tabpose_window.mm +++ b/chrome/browser/ui/cocoa/tabpose_window.mm @@ -19,13 +19,12 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tab_contents/thumbnail_generator.h" -#include "chrome/browser/tab_contents_wrapper.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/tab_strip_controller.h" #import "chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/pref_names.h" #include "grit/app_resources.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm index 46f0bca..97ba095 100644 --- a/chrome/browser/ui/cocoa/tabpose_window_unittest.mm +++ b/chrome/browser/ui/cocoa/tabpose_window_unittest.mm @@ -7,10 +7,10 @@ #import "chrome/browser/browser_window.h" #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #import "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "testing/gtest/include/gtest/gtest.h" class TabposeWindowTest : public CocoaTest { diff --git a/chrome/browser/ui/cocoa/view_id_util.h b/chrome/browser/ui/cocoa/view_id_util.h index e4ca62c..6ea9524 100644 --- a/chrome/browser/ui/cocoa/view_id_util.h +++ b/chrome/browser/ui/cocoa/view_id_util.h @@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #include "gfx/native_widget_types.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" // ViewIDs are a system that indexes important views in the browser window by a // ViewID identifier (integer). This is a useful compatibility for finding a diff --git a/chrome/browser/input_window_dialog.h b/chrome/browser/ui/input_window_dialog.h index bb8d575..aa7455a 100644 --- a/chrome/browser/input_window_dialog.h +++ b/chrome/browser/ui/input_window_dialog.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_INPUT_WINDOW_DIALOG_H_ -#define CHROME_BROWSER_INPUT_WINDOW_DIALOG_H_ +#ifndef CHROME_BROWSER_UI_INPUT_WINDOW_DIALOG_H_ +#define CHROME_BROWSER_UI_INPUT_WINDOW_DIALOG_H_ #pragma once #include <string> @@ -50,4 +50,4 @@ class InputWindowDialog { DISALLOW_COPY_AND_ASSIGN(InputWindowDialog); }; -#endif // CHROME_BROWSER_INPUT_WINDOW_DIALOG_H_ +#endif // CHROME_BROWSER_UI_INPUT_WINDOW_DIALOG_H_ diff --git a/chrome/browser/input_window_dialog_gtk.cc b/chrome/browser/ui/input_window_dialog_gtk.cc index 136aed1..1530701 100644 --- a/chrome/browser/input_window_dialog_gtk.cc +++ b/chrome/browser/ui/input_window_dialog_gtk.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/input_window_dialog.h" +#include "chrome/browser/ui/input_window_dialog.h" #include <gtk/gtk.h> diff --git a/chrome/browser/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc index f8c8d32..f6b8511 100644 --- a/chrome/browser/input_window_dialog_win.cc +++ b/chrome/browser/ui/input_window_dialog_win.cc @@ -1,8 +1,8 @@ -// 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. -#include "chrome/browser/input_window_dialog.h" +#include "chrome/browser/ui/input_window_dialog.h" #include "base/compiler_specific.h" #include "base/message_loop.h" diff --git a/chrome/browser/location_bar.h b/chrome/browser/ui/omnibox/location_bar.h index b6a6d0d..87a6fa8 100644 --- a/chrome/browser/location_bar.h +++ b/chrome/browser/ui/omnibox/location_bar.h @@ -8,8 +8,8 @@ // specific implementations of the location bar control. It also allows the // location bar to be mocked for testing. -#ifndef CHROME_BROWSER_LOCATION_BAR_H_ -#define CHROME_BROWSER_LOCATION_BAR_H_ +#ifndef CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_H_ +#define CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_H_ #pragma once #include <string> @@ -103,4 +103,4 @@ class LocationBarTesting { virtual ~LocationBarTesting() {} }; -#endif // CHROME_BROWSER_LOCATION_BAR_H_ +#endif // CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_H_ diff --git a/chrome/browser/location_bar_util.cc b/chrome/browser/ui/omnibox/location_bar_util.cc index a398ada..00214ef 100644 --- a/chrome/browser/location_bar_util.cc +++ b/chrome/browser/ui/omnibox/location_bar_util.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/location_bar_util.h" +#include "chrome/browser/ui/omnibox/location_bar_util.h" #include "app/l10n_util.h" #include "base/i18n/rtl.h" diff --git a/chrome/browser/location_bar_util.h b/chrome/browser/ui/omnibox/location_bar_util.h index 891c67f..ca6a214 100644 --- a/chrome/browser/location_bar_util.h +++ b/chrome/browser/ui/omnibox/location_bar_util.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_LOCATION_BAR_UTIL_H_ -#define CHROME_BROWSER_LOCATION_BAR_UTIL_H_ +#ifndef CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_UTIL_H_ +#define CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_UTIL_H_ #pragma once #include <string> @@ -21,4 +21,4 @@ std::wstring CalculateMinString(const std::wstring& description); } // namespace location_bar_util -#endif // CHROME_BROWSER_LOCATION_BAR_UTIL_H_ +#endif // CHROME_BROWSER_UI_OMNIBOX_LOCATION_BAR_UTIL_H_ diff --git a/chrome/browser/options_page_base.cc b/chrome/browser/ui/options/options_page_base.cc index 6ee5610..601e485 100644 --- a/chrome/browser/options_page_base.cc +++ b/chrome/browser/ui/options/options_page_base.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/options_page_base.h" +#include "chrome/browser/ui/options/options_page_base.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/options_page_base.h b/chrome/browser/ui/options/options_page_base.h index 0e6c756..695df1cf 100644 --- a/chrome/browser/options_page_base.h +++ b/chrome/browser/ui/options/options_page_base.h @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_OPTIONS_PAGE_BASE_H_ -#define CHROME_BROWSER_OPTIONS_PAGE_BASE_H_ +#ifndef CHROME_BROWSER_UI_OPTIONS_OPTIONS_PAGE_BASE_H_ +#define CHROME_BROWSER_UI_OPTIONS_OPTIONS_PAGE_BASE_H_ #pragma once #include <string> #include "base/basictypes.h" -#include "chrome/browser/options_window.h" -#include "chrome/common/notification_observer.h" #include "chrome/browser/metrics/user_metrics.h" +#include "chrome/browser/ui/options/options_window.h" +#include "chrome/common/notification_observer.h" class PrefService; class Profile; @@ -59,4 +59,4 @@ class OptionsPageBase : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(OptionsPageBase); }; -#endif // CHROME_BROWSER_OPTIONS_PAGE_BASE_H_ +#endif // CHROME_BROWSER_UI_OPTIONS_OPTIONS_PAGE_BASE_H_ diff --git a/chrome/browser/options_util.cc b/chrome/browser/ui/options/options_util.cc index dab7101..465df98 100644 --- a/chrome/browser/options_util.cc +++ b/chrome/browser/ui/options/options_util.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/options_util.h" +#include "chrome/browser/ui/options/options_util.h" #include "base/thread_restrictions.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/options_util.h b/chrome/browser/ui/options/options_util.h index 3dd10cf..5280051 100644 --- a/chrome/browser/options_util.h +++ b/chrome/browser/ui/options/options_util.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_OPTIONS_UTIL_H_ -#define CHROME_BROWSER_OPTIONS_UTIL_H_ +#ifndef CHROME_BROWSER_UI_OPTIONS_OPTIONS_UTIL_H_ +#define CHROME_BROWSER_UI_OPTIONS_OPTIONS_UTIL_H_ #pragma once #include "base/basictypes.h" @@ -23,4 +23,4 @@ class OptionsUtil { DISALLOW_IMPLICIT_CONSTRUCTORS(OptionsUtil); }; -#endif // CHROME_BROWSER_OPTIONS_UTIL_H_ +#endif // CHROME_BROWSER_UI_OPTIONS_OPTIONS_UTIL_H_ diff --git a/chrome/browser/options_window.h b/chrome/browser/ui/options/options_window.h index 53292bd..f088f1a 100644 --- a/chrome/browser/options_window.h +++ b/chrome/browser/ui/options/options_window.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_OPTIONS_WINDOW_H__ -#define CHROME_BROWSER_OPTIONS_WINDOW_H__ +#ifndef CHROME_BROWSER_UI_OPTIONS_OPTIONS_WINDOW_H_ +#define CHROME_BROWSER_UI_OPTIONS_OPTIONS_WINDOW_H_ #pragma once class Profile; @@ -37,4 +37,4 @@ void ShowOptionsWindow(OptionsPage page, OptionsGroup highlight_group, Profile* profile); -#endif // CHROME_BROWSER_OPTIONS_WINDOW_H_ +#endif // CHROME_BROWSER_UI_OPTIONS_OPTIONS_WINDOW_H_ diff --git a/chrome/browser/show_options_url.cc b/chrome/browser/ui/options/show_options_url.cc index 3761da4..46e2dac 100644 --- a/chrome/browser/show_options_url.cc +++ b/chrome/browser/ui/options/show_options_url.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/show_options_url.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/show_options_url.h b/chrome/browser/ui/options/show_options_url.h index afa339dd..e849169 100644 --- a/chrome/browser/show_options_url.h +++ b/chrome/browser/ui/options/show_options_url.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_SHOW_OPTIONS_URL_H_ -#define CHROME_BROWSER_SHOW_OPTIONS_URL_H_ +#ifndef CHROME_BROWSER_UI_OPTIONS_SHOW_OPTIONS_URL_H_ +#define CHROME_BROWSER_UI_OPTIONS_SHOW_OPTIONS_URL_H_ #pragma once class GURL; @@ -17,4 +17,4 @@ void ShowOptionsURL(Profile* profile, const GURL& url); } // namespace browser -#endif // CHROME_BROWSER_SHOW_OPTIONS_URL_H_ +#endif // CHROME_BROWSER_UI_OPTIONS_SHOW_OPTIONS_URL_H_ diff --git a/chrome/browser/status_bubble.h b/chrome/browser/ui/status_bubble.h index e7ddc15..e7ddc15 100644 --- a/chrome/browser/status_bubble.h +++ b/chrome/browser/ui/status_bubble.h diff --git a/chrome/browser/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc index a7f52f1..0adec32 100644 --- a/chrome/browser/tab_contents_wrapper.cc +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.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/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "base/singleton.h" #include "chrome/browser/password_manager/password_manager.h" diff --git a/chrome/browser/tab_contents_wrapper.h b/chrome/browser/ui/tab_contents/tab_contents_wrapper.h index 4723da9..f47a6ad 100644 --- a/chrome/browser/tab_contents_wrapper.h +++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.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_TAB_CONTENTS_WRAPPER_H_ -#define CHROME_BROWSER_TAB_CONTENTS_WRAPPER_H_ +#ifndef CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ +#define CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ #pragma once #include "base/scoped_ptr.h" @@ -76,4 +76,4 @@ class TabContentsWrapper : public WebNavigationObserver { scoped_ptr<TabContents> tab_contents_; }; -#endif // CHROME_BROWSER_TAB_CONTENTS_WRAPPER_H_ +#endif // CHROME_BROWSER_UI_TAB_CONTENTS_TAB_CONTENTS_WRAPPER_H_ diff --git a/chrome/browser/tab_menu_model.cc b/chrome/browser/ui/tabs/tab_menu_model.cc index 6189080..6d96adb 100644 --- a/chrome/browser/tab_menu_model.cc +++ b/chrome/browser/ui/tabs/tab_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/tab_menu_model.h" +#include "chrome/browser/ui/tabs/tab_menu_model.h" #include "base/command_line.h" #include "chrome/browser/tabs/tab_strip_model.h" diff --git a/chrome/browser/tab_menu_model.h b/chrome/browser/ui/tabs/tab_menu_model.h index 0f7dedd9..aeff953 100644 --- a/chrome/browser/tab_menu_model.h +++ b/chrome/browser/ui/tabs/tab_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_TAB_MENU_MODEL_H_ -#define CHROME_BROWSER_TAB_MENU_MODEL_H_ +#ifndef CHROME_BROWSER_UI_TABS_TAB_MENU_MODEL_H_ +#define CHROME_BROWSER_UI_TABS_TAB_MENU_MODEL_H_ #pragma once #include "app/menus/simple_menu_model.h" @@ -26,4 +26,4 @@ class TabMenuModel : public menus::SimpleMenuModel { DISALLOW_COPY_AND_ASSIGN(TabMenuModel); }; -#endif // CHROME_BROWSER_TAB_MENU_MODEL_H_ +#endif // CHROME_BROWSER_UI_TABS_TAB_MENU_MODEL_H_ diff --git a/chrome/browser/tab_menu_model_unittest.cc b/chrome/browser/ui/tabs/tab_menu_model_unittest.cc index fd39e57..9f30412 100644 --- a/chrome/browser/tab_menu_model_unittest.cc +++ b/chrome/browser/ui/tabs/tab_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/tab_menu_model.h" +#include "chrome/browser/ui/tabs/tab_menu_model.h" #include "chrome/test/menu_model_test.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/browser_uitest.cc b/chrome/browser/ui/tests/browser_uitest.cc index 6b8c735..6b8c735 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/ui/tests/browser_uitest.cc diff --git a/chrome/browser/view_ids.h b/chrome/browser/ui/view_ids.h index 948eabb..948eabb 100644 --- a/chrome/browser/view_ids.h +++ b/chrome/browser/ui/view_ids.h diff --git a/chrome/browser/ui/views/accessible_pane_view.cc b/chrome/browser/ui/views/accessible_pane_view.cc index b876940..fa8a478 100644 --- a/chrome/browser/ui/views/accessible_pane_view.cc +++ b/chrome/browser/ui/views/accessible_pane_view.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/logging.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" -#include "chrome/browser/views/accessible_pane_view.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/views/accessible_pane_view.h" #include "views/controls/button/menu_button.h" #include "views/controls/native/native_view_host.h" #include "views/focus/focus_search.h" diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc index be90191..8a07f1d 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_view.cc @@ -32,11 +32,11 @@ #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/view_ids.h" -#include "chrome/browser/views/bookmark_context_menu.h" -#include "chrome/browser/views/event_utils.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/bookmark_context_menu.h" +#include "chrome/browser/ui/views/event_utils.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index ce7bb4b..268dd13 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -21,11 +21,11 @@ #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/view_ids.h" -#include "chrome/browser/views/detachable_toolbar_view.h" -#include "chrome/browser/views/extensions/browser_action_drag_data.h" -#include "chrome/browser/views/extensions/extension_popup.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/detachable_toolbar_view.h" +#include "chrome/browser/ui/views/extensions/browser_action_drag_data.h" +#include "chrome/browser/ui/views/extensions/extension_popup.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/notification_source.h" diff --git a/chrome/browser/ui/views/dialog_stubs_gtk.cc b/chrome/browser/ui/views/dialog_stubs_gtk.cc index a8e4535..de6c676 100644 --- a/chrome/browser/ui/views/dialog_stubs_gtk.cc +++ b/chrome/browser/ui/views/dialog_stubs_gtk.cc @@ -18,9 +18,9 @@ #include "chrome/browser/gtk/options/passwords_exceptions_window_gtk.h" #include "chrome/browser/gtk/repost_form_warning_gtk.h" #include "chrome/browser/gtk/task_manager_gtk.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/views/browser_dialogs.h" +#include "chrome/browser/ui/options/options_window.h" +#include "chrome/browser/ui/views/browser_dialogs.h" #include "views/widget/widget.h" namespace browser { diff --git a/chrome/browser/ui/views/download_shelf_view.cc b/chrome/browser/ui/views/download_shelf_view.cc index 7ad21cc..5db8ba1 100644 --- a/chrome/browser/ui/views/download_shelf_view.cc +++ b/chrome/browser/ui/views/download_shelf_view.cc @@ -16,9 +16,9 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/download_item_view.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/download_item_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc index 6b6162a..66fb702 100644 --- a/chrome/browser/ui/views/dropdown_bar_host.cc +++ b/chrome/browser/ui/views/dropdown_bar_host.cc @@ -8,12 +8,12 @@ #include "app/slide_animation.h" #include "base/scoped_handle.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/dropdown_bar_view.h" -#include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/dropdown_bar_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "gfx/path.h" #include "gfx/scrollbar_size.h" #include "views/focus/external_focus_tracker.h" diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 44cb187..e185b52 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -7,13 +7,13 @@ #include "app/keyboard_codes.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/renderer_host/render_view_host.h" -#include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/find_bar_view.h" -#include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/find_bar_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "views/focus/external_focus_tracker.h" #include "views/focus/view_storage.h" #include "views/widget/root_view.h" 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 361faa0..92b5fbf 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -11,9 +11,9 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "chrome/browser/views/find_bar_host.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/find_bar_host.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" #include "net/test/test_server.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 12dbd4c..261ea1d 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -16,9 +16,9 @@ #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/ui/find_bar/find_bar_state.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/find_bar_host.h" -#include "chrome/browser/views/frame/browser_view.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/find_bar_host.h" +#include "chrome/browser/ui/views/frame/browser_view.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" 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 6688d9e..be9acb1 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -13,11 +13,11 @@ #include "base/i18n/rtl.h" #include "base/rand_util.h" #include "base/time.h" -#include "chrome/browser/options_window.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/search_engine_type.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" +#include "chrome/browser/ui/options/options_window.h" #include "gfx/canvas.h" #include "gfx/font.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/ui/views/frame/browser_frame_gtk.cc b/chrome/browser/ui/views/frame/browser_frame_gtk.cc index a2badbd..ad20334 100644 --- a/chrome/browser/ui/views/frame/browser_frame_gtk.cc +++ b/chrome/browser/ui/views/frame/browser_frame_gtk.cc @@ -6,13 +6,13 @@ #include "base/logging.h" #include "chrome/browser/profile.h" -#include "chrome/browser/status_bubble.h" #include "chrome/browser/themes/browser_theme_provider.h" -#include "chrome/browser/views/frame/app_panel_browser_frame_view.h" -#include "chrome/browser/views/frame/browser_root_view.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/frame/opaque_browser_frame_view.h" -#include "chrome/browser/views/frame/popup_non_client_frame_view.h" +#include "chrome/browser/ui/status_bubble.h" +#include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" +#include "chrome/browser/ui/views/frame/browser_root_view.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" +#include "chrome/browser/ui/views/frame/popup_non_client_frame_view.h" #include "gfx/font.h" #include "views/widget/root_view.h" #include "views/window/hit_test.h" diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index e99cccb..7264a7f 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc @@ -10,11 +10,11 @@ #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" #include "chrome/browser/autocomplete/autocomplete_match.h" -#include "chrome/browser/location_bar.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/browser/views/tabs/tab_strip.h" +#include "chrome/browser/ui/omnibox/location_bar.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" #include "grit/chromium_strings.h" BrowserRootView::BrowserRootView(BrowserView* browser_view, diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 64ef258..9985a83 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -35,13 +35,14 @@ #include "chrome/browser/sidebar/sidebar_manager.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #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/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" +#include "chrome/browser/ui/view_ids.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" @@ -59,7 +60,6 @@ #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/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/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index 6fa2b67..914f202 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -7,15 +7,15 @@ #include "chrome/browser/sidebar/sidebar_manager.h" #include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/ui/find_bar/find_bar_controller.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/bookmark_bar_view.h" -#include "chrome/browser/views/download_shelf_view.h" -#include "chrome/browser/views/frame/browser_frame.h" -#include "chrome/browser/views/frame/browser_view.h" -#include "chrome/browser/views/frame/contents_container.h" -#include "chrome/browser/views/tabs/side_tab_strip.h" -#include "chrome/browser/views/tabs/tab_strip.h" -#include "chrome/browser/views/toolbar_view.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/bookmark_bar_view.h" +#include "chrome/browser/ui/views/download_shelf_view.h" +#include "chrome/browser/ui/views/frame/browser_frame.h" +#include "chrome/browser/ui/views/frame/browser_view.h" +#include "chrome/browser/ui/views/frame/contents_container.h" +#include "chrome/browser/ui/views/tabs/side_tab_strip.h" +#include "chrome/browser/ui/views/tabs/tab_strip.h" +#include "chrome/browser/ui/views/toolbar_view.h" #include "gfx/scrollbar_size.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/infobars/infobar_container.cc b/chrome/browser/ui/views/infobars/infobar_container.cc index 5779fde..5096629 100644 --- a/chrome/browser/ui/views/infobars/infobar_container.cc +++ b/chrome/browser/ui/views/infobars/infobar_container.cc @@ -7,8 +7,8 @@ #include "app/l10n_util.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/infobars/infobars.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/infobars/infobars.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/ui/views/location_bar/click_handler.cc b/chrome/browser/ui/views/location_bar/click_handler.cc index 92b2bb7..38002ff 100644 --- a/chrome/browser/ui/views/location_bar/click_handler.cc +++ b/chrome/browser/ui/views/location_bar/click_handler.cc @@ -6,8 +6,8 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "views/view.h" ClickHandler::ClickHandler(const views::View* owner, 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 7115f15..cd151bb 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 @@ -11,9 +11,9 @@ #include "chrome/browser/content_setting_bubble_model.h" #include "chrome/browser/content_setting_image_model.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" -#include "chrome/browser/views/content_setting_bubble_contents.h" -#include "chrome/browser/views/location_bar/location_bar_view.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/views/content_setting_bubble_contents.h" +#include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/common/chrome_switches.h" #include "gfx/canvas.h" #include "gfx/canvas_skia.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 847d53b..9b78c6b 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -25,18 +25,18 @@ #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/location_bar/suggested_text_view.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/browser_dialogs.h" -#include "chrome/browser/views/location_bar/content_setting_image_view.h" -#include "chrome/browser/views/location_bar/ev_bubble_view.h" -#include "chrome/browser/views/location_bar/keyword_hint_view.h" -#include "chrome/browser/views/location_bar/location_icon_view.h" -#include "chrome/browser/views/location_bar/page_action_image_view.h" -#include "chrome/browser/views/location_bar/page_action_with_badge_view.h" -#include "chrome/browser/views/location_bar/selected_keyword_view.h" -#include "chrome/browser/views/location_bar/star_view.h" +#include "chrome/browser/ui/views/browser_dialogs.h" +#include "chrome/browser/ui/views/location_bar/content_setting_image_view.h" +#include "chrome/browser/ui/views/location_bar/ev_bubble_view.h" +#include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" +#include "chrome/browser/ui/views/location_bar/location_icon_view.h" +#include "chrome/browser/ui/views/location_bar/page_action_image_view.h" +#include "chrome/browser/ui/views/location_bar/page_action_with_badge_view.h" +#include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" +#include "chrome/browser/ui/views/location_bar/star_view.h" #include "gfx/canvas_skia.h" #include "gfx/color_utils.h" #include "gfx/skia_util.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 d83c7de..ebc59a8 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -13,9 +13,9 @@ #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/extensions/extension_context_menu_model.h" #include "chrome/browser/first_run/first_run.h" -#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/ui/omnibox/location_bar.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/views/extensions/extension_popup.h" #include "chrome/common/notification_observer.h" diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc index 182015b..fec984e 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc @@ -7,9 +7,9 @@ #include "app/l10n_util.h" #include "base/logging.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/location_bar_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/location_bar/keyword_hint_view.h" +#include "chrome/browser/ui/omnibox/location_bar_util.h" +#include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" #include "grit/generated_resources.h" SelectedKeywordView::SelectedKeywordView(const int background_images[], diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index 7d22441..95de4c0 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -8,8 +8,8 @@ #include "app/resource_bundle.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/browser_dialogs.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/browser_dialogs.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index 5982ee6..056f08d 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -28,7 +28,6 @@ #include "chrome/browser/download/download_prefs.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/gears_integration.h" -#include "chrome/browser/options_util.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/pref_set_observer.h" @@ -39,14 +38,15 @@ #include "chrome/browser/renderer_host/resource_dispatcher_host.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/browser/show_options_url.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/browser_dialogs.h" -#include "chrome/browser/views/clear_browsing_data.h" -#include "chrome/browser/views/list_background.h" -#include "chrome/browser/views/options/content_settings_window_view.h" -#include "chrome/browser/views/options/fonts_languages_window_view.h" -#include "chrome/browser/views/restart_message_box.h" +#include "chrome/browser/ui/options/options_util.h" +#include "chrome/browser/ui/options/show_options_url.h" +#include "chrome/browser/ui/views/browser_dialogs.h" +#include "chrome/browser/ui/views/clear_browsing_data.h" +#include "chrome/browser/ui/views/list_background.h" +#include "chrome/browser/ui/views/options/content_settings_window_view.h" +#include "chrome/browser/ui/views/options/fonts_languages_window_view.h" +#include "chrome/browser/ui/views/restart_message_box.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/views/options/advanced_page_view.cc b/chrome/browser/ui/views/options/advanced_page_view.cc index 712955c..0c42e3b 100644 --- a/chrome/browser/ui/views/options/advanced_page_view.cc +++ b/chrome/browser/ui/views/options/advanced_page_view.cc @@ -7,10 +7,10 @@ #include "app/l10n_util.h" #include "app/message_box_flags.h" #include "base/string_util.h" -#include "chrome/browser/options_util.h" #include "chrome/browser/profile.h" -#include "chrome/browser/views/options/advanced_contents_view.h" -#include "chrome/browser/views/options/managed_prefs_banner_view.h" +#include "chrome/browser/ui/options/options_util.h" +#include "chrome/browser/ui/views/options/advanced_contents_view.h" +#include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" #include "chrome/common/chrome_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.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 d1912f0..0814b24 100644 --- a/chrome/browser/ui/views/options/cookie_filter_page_view.cc +++ b/chrome/browser/ui/views/options/cookie_filter_page_view.cc @@ -7,8 +7,8 @@ #include "app/l10n_util.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profile.h" -#include "chrome/browser/show_options_url.h" -#include "chrome/browser/views/options/cookies_view.h" +#include "chrome/browser/ui/options/show_options_url.h" +#include "chrome/browser/ui/views/options/cookies_view.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc index e8a5457..98135ab 100644 --- a/chrome/browser/ui/views/options/general_page_view.cc +++ b/chrome/browser/ui/views/options/general_page_view.cc @@ -23,11 +23,11 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/search_engines/template_url_model_observer.h" -#include "chrome/browser/show_options_url.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/keyword_editor_view.h" -#include "chrome/browser/views/options/managed_prefs_banner_view.h" -#include "chrome/browser/views/options/options_group_view.h" +#include "chrome/browser/ui/options/show_options_url.h" +#include "chrome/browser/ui/views/keyword_editor_view.h" +#include "chrome/browser/ui/views/options/managed_prefs_banner_view.h" +#include "chrome/browser/ui/views/options/options_group_view.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/views/options/options_page_view.h b/chrome/browser/ui/views/options/options_page_view.h index 8562f11..bbbc8c4 100644 --- a/chrome/browser/ui/views/options/options_page_view.h +++ b/chrome/browser/ui/views/options/options_page_view.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_VIEWS_OPTIONS_OPTIONS_PAGE_VIEW_H__ #pragma once -#include "chrome/browser/options_page_base.h" +#include "chrome/browser/ui/options/options_page_base.h" #include "views/controls/link.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/options/options_window_view.cc b/chrome/browser/ui/views/options/options_window_view.cc index e52c8ae..dc3518b 100644 --- a/chrome/browser/ui/views/options/options_window_view.cc +++ b/chrome/browser/ui/views/options/options_window_view.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/options_window.h" - #include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -11,6 +9,7 @@ #include "chrome/browser/profile.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/options/options_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" 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 aee62ff..94ae40d 100644 --- a/chrome/browser/ui/views/options/plugin_filter_page_view.cc +++ b/chrome/browser/ui/views/options/plugin_filter_page_view.cc @@ -5,8 +5,8 @@ #include "chrome/browser/views/options/plugin_filter_page_view.h" #include "app/l10n_util.h" -#include "chrome/browser/show_options_url.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "views/grid_layout.h" diff --git a/chrome/browser/ui/views/status_bubble_views.h b/chrome/browser/ui/views/status_bubble_views.h index 118f027..456eab7 100644 --- a/chrome/browser/ui/views/status_bubble_views.h +++ b/chrome/browser/ui/views/status_bubble_views.h @@ -10,7 +10,7 @@ #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/task.h" -#include "chrome/browser/status_bubble.h" +#include "chrome/browser/ui/status_bubble.h" #include "googleurl/src/gurl.h" #include "gfx/rect.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc index 0c07fa7..82c0b26 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_gtk.cc @@ -7,8 +7,8 @@ #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/tab_contents/tab_contents_container.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" #include "views/focus/focus_manager.h" #include "views/widget/root_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc index eba411f..99c37a9 100644 --- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc +++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_win.cc @@ -7,9 +7,9 @@ #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/tab_contents/tab_contents_container.h" -#include "chrome/browser/views/tab_contents/tab_contents_view_win.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" +#include "chrome/browser/ui/views/tab_contents/tab_contents_view_win.h" #include "views/focus/focus_manager.h" diff --git a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc index 9ab6078..eb5b1ad 100644 --- a/chrome/browser/ui/views/tab_contents/tab_contents_container.cc +++ b/chrome/browser/ui/views/tab_contents/tab_contents_container.cc @@ -8,8 +8,8 @@ #include "chrome/browser/renderer_host/render_widget_host_view.h" #include "chrome/browser/tab_contents/interstitial_page.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/tab_contents/native_tab_contents_container.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/tab_contents/native_tab_contents_container.h" #include "chrome/common/notification_service.h" #if defined(TOUCH_UI) diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index e612e1d..7efc542 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -15,8 +15,8 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/tabs/tab_controller.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/tabs/tab_controller.h" #include "chrome/common/chrome_switches.h" #include "gfx/canvas_skia.h" #include "gfx/favicon_size.h" diff --git a/chrome/browser/ui/views/tabs/base_tab_strip.cc b/chrome/browser/ui/views/tabs/base_tab_strip.cc index 4f844ed..e45aca6 100644 --- a/chrome/browser/ui/views/tabs/base_tab_strip.cc +++ b/chrome/browser/ui/views/tabs/base_tab_strip.cc @@ -5,9 +5,9 @@ #include "chrome/browser/views/tabs/base_tab_strip.h" #include "base/logging.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/tabs/dragged_tab_controller.h" -#include "chrome/browser/views/tabs/tab_strip_controller.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/tabs/dragged_tab_controller.h" +#include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "views/widget/root_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index 426fe58..c9b96eb 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -10,12 +10,12 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" -#include "chrome/browser/tab_menu_model.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/views/tabs/base_tab_strip.h" -#include "chrome/browser/views/tabs/tab_renderer_data.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/browser/ui/tabs/tab_menu_model.h" +#include "chrome/browser/ui/views/tabs/base_tab_strip.h" +#include "chrome/browser/ui/views/tabs/tab_renderer_data.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.h b/chrome/browser/ui/views/tabs/dragged_tab_controller.h index f00a0ef..78481ae 100644 --- a/chrome/browser/ui/views/tabs/dragged_tab_controller.h +++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.h @@ -10,7 +10,7 @@ #include "base/scoped_ptr.h" #include "base/timer.h" #include "chrome/browser/tab_contents/tab_contents_delegate.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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/ui/views/tabs/side_tab_strip.cc b/chrome/browser/ui/views/tabs/side_tab_strip.cc index b449bb9..c9e2b69 100644 --- a/chrome/browser/ui/views/tabs/side_tab_strip.cc +++ b/chrome/browser/ui/views/tabs/side_tab_strip.cc @@ -6,9 +6,9 @@ #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "chrome/browser/views/tabs/side_tab.h" -#include "chrome/browser/views/tabs/tab_strip_controller.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/tabs/side_tab.h" +#include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/views/tabs/tab_dragging_test.cc b/chrome/browser/ui/views/tabs/tab_dragging_test.cc index 2cb0171..dc433ad 100644 --- a/chrome/browser/ui/views/tabs/tab_dragging_test.cc +++ b/chrome/browser/ui/views/tabs/tab_dragging_test.cc @@ -5,7 +5,7 @@ #include "base/command_line.h" #include "base/file_util.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 247475b..d8e03f2 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -13,9 +13,9 @@ #include "chrome/browser/defaults.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/view_ids.h" -#include "chrome/browser/views/tabs/tab.h" -#include "chrome/browser/views/tabs/tab_strip_controller.h" +#include "chrome/browser/ui/view_ids.h" +#include "chrome/browser/ui/views/tabs/tab.h" +#include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #include "chrome/common/pref_names.h" #include "gfx/canvas_skia.h" #include "gfx/path.h" diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index bc1e0a3..f2c5e2b 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -16,11 +16,11 @@ #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/view_ids.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/common/badge_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc index 6abc736..bf45ecc 100644 --- a/chrome/browser/unload_uitest.cc +++ b/chrome/browser/unload_uitest.cc @@ -6,7 +6,7 @@ #include "base/file_util.h" #include "base/platform_thread.h" #include "chrome/browser/net/url_request_mock_http_job.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 36cf2ce..12d9021 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1681,9 +1681,6 @@ 'browser/in_process_webkit/webkit_context.h', 'browser/in_process_webkit/webkit_thread.cc', 'browser/in_process_webkit/webkit_thread.h', - 'browser/input_window_dialog.h', - 'browser/input_window_dialog_gtk.cc', - 'browser/input_window_dialog_win.cc', 'browser/instant/instant_commit_type.h', 'browser/instant/instant_confirm_dialog.cc', 'browser/instant/instant_confirm_dialog.h', @@ -1716,9 +1713,6 @@ 'browser/load_notification_details.h', 'browser/enumerate_modules_model_win.cc', 'browser/enumerate_modules_model_win.h', - 'browser/location_bar.h', - 'browser/location_bar_util.cc', - 'browser/location_bar_util.h', 'browser/login_model.h', 'browser/login_prompt.cc', 'browser/login_prompt.h', @@ -1873,11 +1867,6 @@ 'browser/omnibox_search_hint.h', 'browser/oom_priority_manager.cc', 'browser/oom_priority_manager.h', - 'browser/options_page_base.cc', - 'browser/options_page_base.h', - 'browser/options_util.cc', - 'browser/options_util.h', - 'browser/options_window.h', 'browser/page_info_model.cc', 'browser/page_info_model.h', 'browser/parsers/metadata_parser.h', @@ -2262,8 +2251,6 @@ 'browser/shell_integration_mac.mm', 'browser/shell_integration_linux.cc', 'browser/shell_integration_win.cc', - 'browser/show_options_url.cc', - 'browser/show_options_url.h', 'browser/sidebar/sidebar_container.cc', 'browser/sidebar/sidebar_container.h', 'browser/sidebar/sidebar_manager.cc', @@ -2319,7 +2306,6 @@ 'browser/ssl/ssl_request_info.cc', 'browser/ssl/ssl_request_info.h', 'browser/ssl_client_certificate_selector.h', - 'browser/status_bubble.h', 'browser/status_icons/status_tray.cc', 'browser/status_icons/status_tray.h', 'browser/status_icons/status_icon.cc', @@ -2492,10 +2478,6 @@ 'browser/tab_contents/web_drop_target_win.cc', 'browser/tab_contents/web_drop_target_win.h', 'browser/tab_contents/web_navigation_observer.h', - 'browser/tab_contents_wrapper.cc', - 'browser/tab_contents_wrapper.h', - 'browser/tab_menu_model.cc', - 'browser/tab_menu_model.h', 'browser/tabs/default_tab_handler.cc', 'browser/tabs/default_tab_handler.h', 'browser/tabs/pinned_tab_codec.cc', @@ -3013,11 +2995,29 @@ '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/input_window_dialog.h', + 'browser/ui/input_window_dialog_gtk.cc', + 'browser/ui/input_window_dialog_win.cc', + 'browser/ui/omnibox/location_bar.h', + 'browser/ui/omnibox/location_bar_util.cc', + 'browser/ui/omnibox/location_bar_util.h', + 'browser/ui/options/options_page_base.cc', + 'browser/ui/options/options_page_base.h', + 'browser/ui/options/options_util.cc', + 'browser/ui/options/options_util.h', + 'browser/ui/options/options_window.h', + 'browser/ui/options/show_options_url.cc', + 'browser/ui/options/show_options_url.h', + 'browser/ui/status_bubble.h', + 'browser/ui/tab_contents/tab_contents_wrapper.cc', + 'browser/ui/tab_contents/tab_contents_wrapper.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/tabs/tab_menu_model.cc', + 'browser/ui/tabs/tab_menu_model.h', 'browser/ui/toolbar/back_forward_menu_model.cc', 'browser/ui/toolbar/back_forward_menu_model.h', 'browser/ui/toolbar/encoding_menu_controller.cc', @@ -3026,6 +3026,7 @@ 'browser/ui/toolbar/toolbar_model.h', 'browser/ui/toolbar/wrench_menu_model.cc', 'browser/ui/toolbar/wrench_menu_model.h', + 'browser/ui/view_ids.h', 'browser/ui/views/about_chrome_view.cc', 'browser/ui/views/about_chrome_view.h', 'browser/ui/views/about_ipc_dialog.cc', @@ -3398,7 +3399,6 @@ 'browser/user_style_sheet_watcher.h', 'browser/utility_process_host.cc', 'browser/utility_process_host.h', - 'browser/view_ids.h', 'browser/visitedlink_master.cc', 'browser/visitedlink_master.h', 'browser/visitedlink_event_listener.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 1e8bcbd..f78128f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -479,7 +479,6 @@ 'app/chrome_main_uitest.cc', 'browser/appcache/appcache_ui_test.cc', 'browser/browser_encoding_uitest.cc', - 'browser/browser_uitest.cc', 'browser/dom_ui/bookmarks_ui_uitest.cc', 'browser/dom_ui/new_tab_ui_uitest.cc', 'browser/dom_ui/options/options_ui_uitest.cc', @@ -510,6 +509,7 @@ 'browser/tab_contents/view_source_uitest.cc', 'browser/tab_restore_uitest.cc', 'browser/unload_uitest.cc', + 'browser/ui/tests/browser_uitest.cc', 'browser/ui/views/find_bar_host_uitest.cc', 'common/logging_chrome_uitest.cc', 'renderer/external_extension_uitest.cc', @@ -1381,7 +1381,6 @@ 'browser/tab_contents/tab_specific_content_settings_unittest.cc', 'browser/tab_contents/thumbnail_generator_unittest.cc', 'browser/tab_contents/web_contents_unittest.cc', - 'browser/tab_menu_model_unittest.cc', 'browser/tabs/pinned_tab_codec_unittest.cc', 'browser/tabs/tab_strip_model_unittest.cc', 'browser/task_manager/task_manager_unittest.cc', @@ -1549,6 +1548,7 @@ '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/tabs/tab_menu_model_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', diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h index e2198a1..03c4aa5 100644 --- a/chrome/common/automation_messages_internal.h +++ b/chrome/common/automation_messages_internal.h @@ -256,7 +256,7 @@ IPC_BEGIN_MESSAGES(Automation) // window coordinates. // Request: // int - the handle of the window in which the view appears - // int - the ID of the view, as specified in chrome/browser/view_ids.h + // int - the ID of the view, as specified in chrome/browser/ui/view_ids.h // bool - whether the bounds should be returned in the screen coordinates // (if true) or in the browser coordinates (if false). // Response: diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc index 04c75da..6b6d388 100644 --- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc +++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/test/automated_ui_tests/automated_ui_test_base.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/test/automated_ui_tests/automated_ui_tests.cc b/chrome/test/automated_ui_tests/automated_ui_tests.cc index 2c6cc35..0b5d15b 100644 --- a/chrome/test/automated_ui_tests/automated_ui_tests.cc +++ b/chrome/test/automated_ui_tests/automated_ui_tests.cc @@ -20,7 +20,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/env_vars.h" #include "chrome/common/libxml_utils.h" diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc index f96de59..eb197e6 100644 --- a/chrome/test/automation/automation_proxy_uitest.cc +++ b/chrome/test/automation/automation_proxy_uitest.cc @@ -20,7 +20,7 @@ #include "build/build_config.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/net/url_request_slow_http_job.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/test/browser_with_test_window_test.cc b/chrome/test/browser_with_test_window_test.cc index 0871256..6469ae8 100644 --- a/chrome/test/browser_with_test_window_test.cc +++ b/chrome/test/browser_with_test_window_test.cc @@ -11,10 +11,10 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc index e9423ef..550f8d4 100644 --- a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc +++ b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc @@ -5,7 +5,7 @@ #include "app/message_box_flags.h" #include "base/file_path.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/test/automation/automation_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" diff --git a/chrome/test/live_sync/live_sessions_sync_test.h b/chrome/test/live_sync/live_sessions_sync_test.h index b4a03c5..06260a2 100644 --- a/chrome/test/live_sync/live_sessions_sync_test.h +++ b/chrome/test/live_sync/live_sessions_sync_test.h @@ -20,7 +20,7 @@ #include "chrome/browser/sessions/base_session_service.h" #include "chrome/browser/sessions/session_service_test_helper.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/browser/tab_contents_wrapper.h" +#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/test/live_sync/live_sync_test.h" #include "chrome/test/ui_test_utils.h" #include "googleurl/src/gurl.h" diff --git a/chrome/test/test_location_bar.h b/chrome/test/test_location_bar.h index e0ad99c..e1c8b98 100644 --- a/chrome/test/test_location_bar.h +++ b/chrome/test/test_location_bar.h @@ -7,7 +7,7 @@ #pragma once #include "chrome/browser/first_run/first_run.h" -#include "chrome/browser/location_bar.h" +#include "chrome/browser/ui/omnibox/location_bar.h" #include "chrome/common/page_transition_types.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/test/ui/history_uitest.cc b/chrome/test/ui/history_uitest.cc index 45e0983..d947dbc7 100644 --- a/chrome/test/ui/history_uitest.cc +++ b/chrome/test/ui/history_uitest.cc @@ -5,7 +5,7 @@ // History UI tests #include "base/file_path.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" diff --git a/chrome/test/ui_test_utils.h b/chrome/test/ui_test_utils.h index e07544f..a1eb5bc 100644 --- a/chrome/test/ui_test_utils.h +++ b/chrome/test/ui_test_utils.h @@ -16,7 +16,7 @@ #include "base/message_loop.h" #include "base/scoped_temp_dir.h" #include "base/string16.h" -#include "chrome/browser/view_ids.h" +#include "chrome/browser/ui/view_ids.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" |