diff options
36 files changed, 61 insertions, 61 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 52bfa77..3d5d214 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -60,9 +60,6 @@ #include "chrome/browser/extensions/extension_toolbar_model.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/extensions/user_script_master.h" -#include "chrome/browser/find_bar.h" -#include "chrome/browser/find_bar_controller.h" -#include "chrome/browser/find_notification_details.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/io_thread.h" @@ -84,6 +81,9 @@ #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/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/common/automation_constants.h" #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index d180970..71e87947 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -38,7 +38,6 @@ #include "chrome/browser/download/download_shelf.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/find_bar.h" #include "chrome/browser/history/top_sites.h" #include "chrome/browser/location_bar.h" #include "chrome/browser/login_prompt.h" @@ -63,6 +62,7 @@ #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/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 53184a9..38c81da 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -28,7 +28,6 @@ #include "chrome/browser/debugger/devtools_window.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/gtk/about_chrome_dialog.h" #include "chrome/browser/gtk/accelerators_gtk.h" #include "chrome/browser/gtk/bookmark_bar_gtk.h" @@ -74,6 +73,7 @@ #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/window_sizer.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/native_web_keyboard_event.h" diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc index 786990e..f9178c6 100644 --- a/chrome/browser/gtk/find_bar_gtk.cc +++ b/chrome/browser/gtk/find_bar_gtk.cc @@ -16,8 +16,6 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/find_bar_controller.h" -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/gtk/browser_window_gtk.h" #include "chrome/browser/gtk/cairo_cached_surface.h" #include "chrome/browser/gtk/custom_button.h" @@ -33,6 +31,8 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/find_bar_gtk.h b/chrome/browser/gtk/find_bar_gtk.h index f31e8b5..ba5d554 100644 --- a/chrome/browser/gtk/find_bar_gtk.h +++ b/chrome/browser/gtk/find_bar_gtk.h @@ -10,10 +10,10 @@ #include "base/basictypes.h" #include "base/scoped_ptr.h" -#include "chrome/browser/find_bar.h" #include "chrome/browser/gtk/focus_store_gtk.h" #include "chrome/browser/gtk/owned_widget_gtk.h" #include "chrome/browser/gtk/slide_animator_gtk.h" +#include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/common/notification_observer.h" #include "chrome/common/notification_registrar.h" #include "gfx/point.h" diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc index 0a8e67c..e903da3 100644 --- a/chrome/browser/profile.cc +++ b/chrome/browser/profile.cc @@ -20,13 +20,13 @@ #include "chrome/browser/extensions/extension_message_service.h" #include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/file_system/browser_file_system_context.h" -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/in_process_webkit/webkit_context.h" #include "chrome/browser/net/chrome_url_request_context.h" #include "chrome/browser/notifications/desktop_notification_service.h" #include "chrome/browser/ssl/ssl_host_state.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc index 392fdeb..38a5a0c 100644 --- a/chrome/browser/profile_impl.cc +++ b/chrome/browser/profile_impl.cc @@ -40,7 +40,6 @@ #include "chrome/browser/extensions/user_script_master.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/file_system/browser_file_system_context.h" -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_permission_context.h" #include "chrome/browser/history/history.h" @@ -75,6 +74,7 @@ #include "chrome/browser/tabs/pinned_tab_service.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "chrome/browser/transport_security_persister.h" +#include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/browser/user_style_sheet_watcher.h" #include "chrome/browser/visitedlink_event_listener.h" #include "chrome/browser/visitedlink_master.h" diff --git a/chrome/browser/renderer_host/render_view_host.h b/chrome/browser/renderer_host/render_view_host.h index 403042a..c3eee6e 100644 --- a/chrome/browser/renderer_host/render_view_host.h +++ b/chrome/browser/renderer_host/render_view_host.h @@ -10,8 +10,8 @@ #include <vector> #include "base/scoped_ptr.h" -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/renderer_host/render_widget_host.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/common/content_settings_types.h" #include "chrome/common/page_zoom.h" #include "chrome/common/translate_errors.h" diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index fd60bb55..7fa1f9a 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -46,7 +46,6 @@ #include "chrome/browser/host_zoom_map.h" #include "chrome/browser/favicon_service.h" #include "chrome/browser/file_select_helper.h" -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/hung_renderer_dialog.h" #include "chrome/browser/in_process_webkit/session_storage_namespace.h" @@ -83,6 +82,7 @@ #include "chrome/browser/tab_contents/web_navigation_observer.h" #include "chrome/browser/translate/page_translated_details.h" #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" +#include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/common/bindings_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/tab_contents/tab_contents.h b/chrome/browser/tab_contents/tab_contents.h index 0c13dd3..e93ddeb 100644 --- a/chrome/browser/tab_contents/tab_contents.h +++ b/chrome/browser/tab_contents/tab_contents.h @@ -19,8 +19,6 @@ #include "chrome/browser/download/save_package.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/fav_icon_helper.h" -#include "chrome/browser/find_bar_controller.h" -#include "chrome/browser/find_notification_details.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" #include "chrome/browser/tab_contents/constrained_window.h" @@ -31,6 +29,8 @@ #include "chrome/browser/tab_contents/render_view_host_manager.h" #include "chrome/browser/tab_contents/tab_specific_content_settings.h" #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" +#include "chrome/browser/ui/find_bar/find_notification_details.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/property_bag.h" #include "chrome/common/renderer_preferences.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index a0be08a..d792d430 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -53,8 +53,6 @@ #include "chrome/browser/extensions/extension_prefs.h" #include "chrome/browser/extensions/extension_tabs_module.h" #include "chrome/browser/extensions/extensions_service.h" -#include "chrome/browser/find_bar.h" -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/first_run/first_run.h" #include "chrome/browser/google/google_url_tracker.h" #include "chrome/browser/google/google_util.h" @@ -87,6 +85,8 @@ #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/upgrade_detector.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/browser/window_sizer.h" diff --git a/chrome/browser/ui/cocoa/find_bar_bridge.h b/chrome/browser/ui/cocoa/find_bar_bridge.h index 3a9c197..3bafa66 100644 --- a/chrome/browser/ui/cocoa/find_bar_bridge.h +++ b/chrome/browser/ui/cocoa/find_bar_bridge.h @@ -7,7 +7,7 @@ #pragma once #include "base/logging.h" -#include "chrome/browser/find_bar.h" +#include "chrome/browser/ui/find_bar/find_bar.h" class BrowserWindowCocoa; class FindBarController; diff --git a/chrome/browser/ui/cocoa/find_bar_bridge_unittest.mm b/chrome/browser/ui/cocoa/find_bar_bridge_unittest.mm index 81679fdb..421cb80 100644 --- a/chrome/browser/ui/cocoa/find_bar_bridge_unittest.mm +++ b/chrome/browser/ui/cocoa/find_bar_bridge_unittest.mm @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/find_bar_bridge.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" namespace { diff --git a/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm b/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm index f50d6db..05e5397 100644 --- a/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/find_bar_cocoa_controller.mm @@ -6,7 +6,6 @@ #include "base/mac_util.h" #include "base/sys_string_conversions.h" -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" @@ -17,6 +16,7 @@ #import "chrome/browser/ui/cocoa/find_pasteboard.h" #import "chrome/browser/ui/cocoa/focus_tracker.h" #import "chrome/browser/ui/cocoa/tab_strip_controller.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" namespace { diff --git a/chrome/browser/ui/cocoa/find_bar_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/find_bar_cocoa_controller_unittest.mm index ca85dd2..d7869c2 100644 --- a/chrome/browser/ui/cocoa/find_bar_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/find_bar_cocoa_controller_unittest.mm @@ -5,11 +5,11 @@ #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_window.h" -#include "chrome/browser/find_notification_details.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #import "chrome/browser/ui/cocoa/find_bar_cocoa_controller.h" #import "chrome/browser/ui/cocoa/find_pasteboard.h" #import "chrome/browser/ui/cocoa/find_bar_text_field.h" +#include "chrome/browser/ui/find_bar/find_notification_details.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tab_strip_controller.mm index 7a34c58..46b7395 100644 --- a/chrome/browser/ui/cocoa/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tab_strip_controller.mm @@ -15,8 +15,6 @@ #include "base/nsimage_cache_mac.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" -#include "chrome/browser/find_bar.h" -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/browser/debugger/devtools_window.h" @@ -40,6 +38,8 @@ #import "chrome/browser/ui/cocoa/tab_strip_model_observer_bridge.h" #import "chrome/browser/ui/cocoa/tab_view.h" #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 "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc index ac8c5ce..c4ec58b 100644 --- a/chrome/browser/find_backend_unittest.cc +++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc @@ -5,9 +5,9 @@ #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/browser/tab_contents/test_tab_contents.h" +#include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/common/url_constants.h" #include "chrome/test/testing_profile.h" diff --git a/chrome/browser/find_bar.h b/chrome/browser/ui/find_bar/find_bar.h index 9960895..350682d 100644 --- a/chrome/browser/find_bar.h +++ b/chrome/browser/ui/find_bar/find_bar.h @@ -6,8 +6,8 @@ // for drawing the FindBar bar on the platform and is owned by the // FindBarController. -#ifndef CHROME_BROWSER_FIND_BAR_H_ -#define CHROME_BROWSER_FIND_BAR_H_ +#ifndef CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_H_ +#define CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_H_ #pragma once #include "base/string16.h" @@ -95,4 +95,4 @@ class FindBarTesting { virtual string16 GetMatchCountText() = 0; }; -#endif // CHROME_BROWSER_FIND_BAR_H_ +#endif // CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_H_ diff --git a/chrome/browser/find_bar_controller.cc b/chrome/browser/ui/find_bar/find_bar_controller.cc index da0daf3..ce7c2a5 100644 --- a/chrome/browser/find_bar_controller.cc +++ b/chrome/browser/ui/find_bar/find_bar_controller.cc @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/find_bar_controller.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "base/i18n/rtl.h" #include "build/build_config.h" -#include "chrome/browser/find_bar.h" -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/tab_contents/navigation_entry.h" +#include "chrome/browser/ui/find_bar/find_bar.h" +#include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/common/notification_service.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "gfx/rect.h" diff --git a/chrome/browser/find_bar_controller.h b/chrome/browser/ui/find_bar/find_bar_controller.h index 4d949a3..1c3a1d6 100644 --- a/chrome/browser/find_bar_controller.h +++ b/chrome/browser/ui/find_bar/find_bar_controller.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_FIND_BAR_CONTROLLER_H_ -#define CHROME_BROWSER_FIND_BAR_CONTROLLER_H_ +#ifndef CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_CONTROLLER_H_ +#define CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_CONTROLLER_H_ #pragma once #include "base/basictypes.h" @@ -86,4 +86,4 @@ class FindBarController : public NotificationObserver { DISALLOW_COPY_AND_ASSIGN(FindBarController); }; -#endif // CHROME_BROWSER_FIND_BAR_CONTROLLER_H_ +#endif // CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_CONTROLLER_H_ diff --git a/chrome/browser/find_bar_host_browsertest.cc b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc index e1c8993..e37e43a 100644 --- a/chrome/browser/find_bar_host_browsertest.cc +++ b/chrome/browser/ui/find_bar/find_bar_host_browsertest.cc @@ -6,9 +6,6 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/find_bar.h" -#include "chrome/browser/find_bar_controller.h" -#include "chrome/browser/find_notification_details.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -17,6 +14,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" +#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/common/notification_service.h" #include "chrome/test/in_process_browser_test.h" #include "chrome/test/ui_test_utils.h" diff --git a/chrome/browser/find_bar_state.cc b/chrome/browser/ui/find_bar/find_bar_state.cc index d33d104..667ac53 100644 --- a/chrome/browser/find_bar_state.cc +++ b/chrome/browser/ui/find_bar/find_bar_state.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/profile.h" +#include "chrome/browser/ui/find_bar/find_bar_state.h" // static string16 FindBarState::GetLastPrepopulateText(Profile* p) { diff --git a/chrome/browser/find_bar_state.h b/chrome/browser/ui/find_bar/find_bar_state.h index 801779e..57f2d2e 100644 --- a/chrome/browser/find_bar_state.h +++ b/chrome/browser/ui/find_bar/find_bar_state.h @@ -5,8 +5,8 @@ // Stores per-profile state needed for find in page. This includes the most // recently searched for term. -#ifndef CHROME_BROWSER_FIND_BAR_STATE_H_ -#define CHROME_BROWSER_FIND_BAR_STATE_H_ +#ifndef CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_STATE_H_ +#define CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_STATE_H_ #pragma once #include "base/basictypes.h" @@ -38,4 +38,4 @@ class FindBarState { DISALLOW_COPY_AND_ASSIGN(FindBarState); }; -#endif // CHROME_BROWSER_FIND_BAR_STATE_H_ +#endif // CHROME_BROWSER_UI_FIND_BAR_FIND_BAR_STATE_H_ diff --git a/chrome/browser/find_notification_details.h b/chrome/browser/ui/find_bar/find_notification_details.h index ee5fc51..d553782 100644 --- a/chrome/browser/find_notification_details.h +++ b/chrome/browser/ui/find_bar/find_notification_details.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_FIND_NOTIFICATION_DETAILS_H_ -#define CHROME_BROWSER_FIND_NOTIFICATION_DETAILS_H_ +#ifndef CHROME_BROWSER_UI_FIND_BAR_FIND_NOTIFICATION_DETAILS_H_ +#define CHROME_BROWSER_UI_FIND_BAR_FIND_NOTIFICATION_DETAILS_H_ #pragma once #include "base/basictypes.h" @@ -48,4 +48,4 @@ class FindNotificationDetails { bool final_update_; // Whether this is the last Find Result update. }; -#endif // CHROME_BROWSER_FIND_NOTIFICATION_DETAILS_H_ +#endif // CHROME_BROWSER_UI_FIND_BAR_FIND_NOTIFICATION_DETAILS_H_ diff --git a/chrome/browser/ui/views/dropdown_bar_host_win.cc b/chrome/browser/ui/views/dropdown_bar_host_win.cc index c14fb21..e3d27c8 100644 --- a/chrome/browser/ui/views/dropdown_bar_host_win.cc +++ b/chrome/browser/ui/views/dropdown_bar_host_win.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/dropdown_bar_host.h" -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/views/frame/browser_view.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/find_bar_host.cc b/chrome/browser/ui/views/find_bar_host.cc index 6dbea33..44cb187 100644 --- a/chrome/browser/ui/views/find_bar_host.cc +++ b/chrome/browser/ui/views/find_bar_host.cc @@ -6,9 +6,9 @@ #include "app/keyboard_codes.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/find_bar_controller.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" diff --git a/chrome/browser/ui/views/find_bar_host.h b/chrome/browser/ui/views/find_bar_host.h index 130b876..496cef0 100644 --- a/chrome/browser/ui/views/find_bar_host.h +++ b/chrome/browser/ui/views/find_bar_host.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_VIEWS_FIND_BAR_HOST_H_ #pragma once -#include "chrome/browser/find_bar.h" #include "chrome/browser/renderer_host/render_view_host_delegate.h" +#include "chrome/browser/ui/find_bar/find_bar.h" #include "chrome/browser/views/dropdown_bar_host.h" #include "gfx/native_widget_types.h" #include "gfx/rect.h" diff --git a/chrome/browser/ui/views/find_bar_host_gtk.cc b/chrome/browser/ui/views/find_bar_host_gtk.cc index d9f8986..e17c6d0 100644 --- a/chrome/browser/ui/views/find_bar_host_gtk.cc +++ b/chrome/browser/ui/views/find_bar_host_gtk.cc @@ -4,8 +4,8 @@ #include "chrome/browser/views/find_bar_host.h" -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/views/frame/browser_view.h" #include "chrome/browser/views/tab_contents/tab_contents_view_gtk.h" #include "views/widget/widget_gtk.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 8feecb8..361faa0 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc @@ -7,10 +7,10 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/find_bar_controller.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/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" diff --git a/chrome/browser/ui/views/find_bar_host_win.cc b/chrome/browser/ui/views/find_bar_host_win.cc index e1e5a50..0133f60 100644 --- a/chrome/browser/ui/views/find_bar_host_win.cc +++ b/chrome/browser/ui/views/find_bar_host_win.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/find_bar_host.h" -#include "chrome/browser/find_bar_controller.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" +#include "chrome/browser/ui/find_bar/find_bar_controller.h" #include "chrome/browser/views/frame/browser_view.h" #include "views/controls/scrollbar/native_scroll_bar.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index 94d46ad..12dbd4c 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -11,11 +11,11 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#include "chrome/browser/find_bar_controller.h" -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #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" diff --git a/chrome/browser/ui/views/find_bar_view.h b/chrome/browser/ui/views/find_bar_view.h index f8197fe..92ab262 100644 --- a/chrome/browser/ui/views/find_bar_view.h +++ b/chrome/browser/ui/views/find_bar_view.h @@ -7,7 +7,7 @@ #pragma once #include "base/string16.h" -#include "chrome/browser/find_notification_details.h" +#include "chrome/browser/ui/find_bar/find_notification_details.h" #include "chrome/browser/views/dropdown_bar_view.h" #include "gfx/size.h" #include "views/controls/button/button.h" diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc index 5b7dc66..6fa2b67 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/frame/browser_view_layout.h" -#include "chrome/browser/find_bar.h" -#include "chrome/browser/find_bar_controller.h" #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" diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index a8ea3b9..19eccfb 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1207,12 +1207,6 @@ 'browser/file_system/browser_file_system_context.h', 'browser/file_system/file_system_dispatcher_host.cc', 'browser/file_system/file_system_dispatcher_host.h', - 'browser/find_bar.h', - 'browser/find_bar_controller.cc', - 'browser/find_bar_controller.h', - 'browser/find_bar_state.h', - 'browser/find_bar_state.cc', - 'browser/find_notification_details.h', 'browser/first_run/first_run.cc', 'browser/first_run/first_run.h', 'browser/first_run/first_run_mac.mm', @@ -3022,6 +3016,12 @@ 'browser/ui/cocoa/wrench_menu_button_cell.mm', 'browser/ui/cocoa/wrench_menu_controller.h', 'browser/ui/cocoa/wrench_menu_controller.mm', + 'browser/ui/find_bar/find_bar.h', + 'browser/ui/find_bar/find_bar_controller.cc', + 'browser/ui/find_bar/find_bar_controller.h', + '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/views/about_chrome_view.cc', 'browser/ui/views/about_chrome_view.h', 'browser/ui/views/about_ipc_dialog.cc', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index b50e5e5a..121094e 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2063,7 +2063,6 @@ 'browser/extensions/stubs_apitest.cc', 'browser/extensions/window_open_apitest.cc', 'browser/file_path_watcher_browsertest.cc', - 'browser/find_bar_host_browsertest.cc', 'browser/first_run/first_run_browsertest.cc', 'browser/geolocation/access_token_store_browsertest.cc', 'browser/geolocation/geolocation_browsertest.cc', @@ -2097,6 +2096,7 @@ 'browser/ui/cocoa/view_id_util_browsertest.mm', 'browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm', 'browser/ui/cocoa/applescript/window_applescript_test.mm', + 'browser/ui/find_bar/find_bar_host_browsertest.cc', 'browser/ui/views/browser_actions_container_browsertest.cc', 'browser/ui/views/dom_view_browsertest.cc', 'browser/ui/views/html_dialog_view_browsertest.cc', diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index 243612e..c36f66b 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -19,7 +19,6 @@ #include "chrome/browser/dom_ui/ntp_resource_cache.h" #include "chrome/browser/extensions/extensions_service.h" #include "chrome/browser/favicon_service.h" -#include "chrome/browser/find_bar_state.h" #include "chrome/browser/geolocation/geolocation_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_permission_context.h" #include "chrome/browser/history/history.h" @@ -35,6 +34,7 @@ #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/themes/browser_theme_provider.h" +#include "chrome/browser/ui/find_bar/find_bar_state.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/net/url_request_context_getter.h" #include "chrome/common/notification_service.h" |