From 2102f7c594370afff68e599d09ff7579a150d82b Mon Sep 17 00:00:00 2001 From: blundell Date: Thu, 9 Jul 2015 03:00:53 -0700 Subject: [PATCH] Move //components/omnibox into //components/omnibox/browser //chrome/common/omnibox_focus_state.h needs to be componentized, as it is used by //chrome/browser/ui/omnibox code. As it's also used by //chrome/renderer, it needs to be componentized into //components/omnibox/common so that DEPS allowances/build dependencies have the expected structure (i.e., don't allow for bleed between renderer and browser code). BUG=371536 TBR=sky Review URL: https://codereview.chromium.org/1229613004 Cr-Commit-Position: refs/heads/master@{#338007} --- chrome/browser/BUILD.gn | 2 +- chrome/browser/about_flags.cc | 2 +- .../omnibox/autocomplete_controller_android.cc | 16 +- .../omnibox/autocomplete_controller_android.h | 4 +- .../browser/android/omnibox/omnibox_prerender.cc | 4 +- .../autocomplete/autocomplete_browsertest.cc | 6 +- .../autocomplete_classifier_factory.cc | 4 +- .../autocomplete/autocomplete_provider_unittest.cc | 14 +- .../autocomplete/bookmark_provider_unittest.cc | 4 +- .../autocomplete/builtin_provider_unittest.cc | 8 +- .../chrome_autocomplete_provider_client.cc | 2 +- .../chrome_autocomplete_provider_client.h | 2 +- .../chrome_autocomplete_scheme_classifier.h | 2 +- .../history_quick_provider_unittest.cc | 12 +- .../autocomplete/history_url_provider_unittest.cc | 12 +- .../autocomplete/in_memory_url_index_factory.cc | 2 +- .../autocomplete/in_memory_url_index_unittest.cc | 6 +- .../keyword_extensions_delegate_impl.h | 10 +- .../keyword_extensions_delegate_impl_unittest.cc | 4 +- .../autocomplete/search_provider_unittest.cc | 20 +- .../autocomplete/shortcuts_backend_factory.cc | 2 +- .../autocomplete/shortcuts_backend_unittest.cc | 4 +- .../autocomplete/shortcuts_database_unittest.cc | 4 +- .../autocomplete/shortcuts_extensions_manager.cc | 2 +- .../autocomplete/shortcuts_provider_unittest.cc | 14 +- .../autocomplete/zero_suggest_provider_unittest.cc | 8 +- .../browser/browsing_data/browsing_data_remover.cc | 2 +- .../browsing_data_remover_unittest.cc | 2 +- chrome/browser/chrome_browser_field_trials.cc | 2 +- .../browser/extensions/api/omnibox/omnibox_api.h | 2 +- .../api/omnibox/omnibox_api_browsertest.cc | 8 +- .../extensions/api/omnibox/omnibox_api_testbase.h | 4 +- chrome/browser/metrics/omnibox_metrics_provider.cc | 8 +- chrome/browser/policy/policy_browsertest.cc | 2 +- .../predictors/autocomplete_action_predictor.cc | 6 +- .../autocomplete_action_predictor_unittest.cc | 2 +- chrome/browser/prefs/browser_prefs.cc | 2 +- chrome/browser/profiles/profile_impl.cc | 4 +- .../render_view_context_menu.cc | 4 +- chrome/browser/rlz/rlz.cc | 2 +- chrome/browser/rlz/rlz_unittest.cc | 4 +- .../search_engines/ui_thread_search_terms_data.cc | 2 +- .../ui/android/omnibox/omnibox_url_emphasizer.cc | 2 +- .../browser/ui/app_list/search/omnibox_provider.cc | 6 +- .../browser/ui/app_list/search/omnibox_provider.h | 2 +- .../browser/ui/app_list/search/omnibox_result.cc | 4 +- chrome/browser/ui/app_list/search/omnibox_result.h | 2 +- .../ui/app_list/search/omnibox_result_unittest.cc | 4 +- .../blocked_content/popup_blocker_browsertest.cc | 4 +- .../browser/ui/cocoa/omnibox/omnibox_popup_cell.h | 2 +- .../browser/ui/cocoa/omnibox/omnibox_popup_cell.mm | 2 +- .../cocoa/omnibox/omnibox_popup_cell_unittest.mm | 2 +- .../ui/cocoa/omnibox/omnibox_popup_matrix.mm | 2 +- .../ui/cocoa/omnibox/omnibox_popup_view_mac.h | 4 +- .../ui/cocoa/omnibox/omnibox_popup_view_mac.mm | 4 +- .../omnibox/omnibox_popup_view_mac_unittest.mm | 2 +- .../browser/ui/cocoa/omnibox/omnibox_view_mac.mm | 6 +- .../ui/cocoa/omnibox/omnibox_view_mac_unittest.mm | 2 +- .../browser/ui/cocoa/tabs/tab_strip_controller.mm | 4 +- .../browser/ui/cocoa/toolbar/toolbar_controller.mm | 4 +- .../ui/omnibox/alternate_nav_infobar_delegate.cc | 2 +- .../ui/omnibox/alternate_nav_infobar_delegate.h | 2 +- chrome/browser/ui/omnibox/omnibox_controller.cc | 8 +- chrome/browser/ui/omnibox/omnibox_controller.h | 6 +- .../ui/omnibox/omnibox_controller_unittest.cc | 4 +- .../omnibox/omnibox_current_page_delegate_impl.cc | 2 +- chrome/browser/ui/omnibox/omnibox_edit_model.cc | 16 +- chrome/browser/ui/omnibox/omnibox_edit_model.h | 6 +- .../ui/omnibox/omnibox_navigation_observer.cc | 2 +- .../ui/omnibox/omnibox_navigation_observer.h | 2 +- chrome/browser/ui/omnibox/omnibox_popup_model.cc | 6 +- chrome/browser/ui/omnibox/omnibox_popup_model.h | 4 +- chrome/browser/ui/omnibox/omnibox_view.cc | 2 +- chrome/browser/ui/omnibox/omnibox_view.h | 2 +- .../browser/ui/omnibox/omnibox_view_browsertest.cc | 6 +- .../search/instant_extended_interactive_uitest.cc | 12 +- .../ui/search/instant_search_prerenderer.cc | 2 +- .../search/instant_search_prerenderer_unittest.cc | 2 +- chrome/browser/ui/toolbar/toolbar_model_impl.cc | 6 +- chrome/browser/ui/views/frame/browser_root_view.cc | 4 +- chrome/browser/ui/views/frame/browser_view.cc | 2 +- chrome/browser/ui/views/frame/browser_view.h | 2 +- .../views/frame/browser_view_interactive_uitest.cc | 2 +- .../ui/views/frame/test_with_browser_view.cc | 6 +- .../ui/views/location_bar/location_bar_view.cc | 2 +- .../ui/views/omnibox/omnibox_popup_contents_view.h | 2 +- .../browser/ui/views/omnibox/omnibox_result_view.h | 4 +- .../browser/ui/views/omnibox/omnibox_view_views.cc | 6 +- .../ui/views/tabs/browser_tab_strip_controller.cc | 4 +- .../browser/ui/webui/omnibox/omnibox_ui_handler.cc | 8 +- .../browser/ui/webui/omnibox/omnibox_ui_handler.h | 6 +- .../ui/webui/options/home_page_overlay_handler.cc | 8 +- .../ui/webui/options/home_page_overlay_handler.h | 2 +- chrome/browser/ui/webui/options/options_ui.cc | 4 +- .../ui/webui/options/startup_pages_handler.cc | 8 +- .../ui/webui/options/startup_pages_handler.h | 2 +- chrome/chrome_browser.gypi | 2 +- chrome/test/BUILD.gn | 2 +- chrome/test/base/history_index_restore_observer.h | 2 +- chrome/test/base/testing_profile.cc | 4 +- chrome/test/base/ui_test_utils.cc | 2 +- components/BUILD.gn | 6 +- components/components_tests.gyp | 22 +- components/omnibox.gypi | 298 ++++++++++----------- components/omnibox/{ => browser}/BUILD.gn | 6 +- components/omnibox/{ => browser}/DEPS | 0 components/omnibox/{ => browser}/answers_cache.cc | 2 +- components/omnibox/{ => browser}/answers_cache.h | 6 +- .../{ => browser}/answers_cache_unittest.cc | 2 +- .../{ => browser}/autocomplete_classifier.cc | 10 +- .../{ => browser}/autocomplete_classifier.h | 8 +- .../{ => browser}/autocomplete_controller.cc | 22 +- .../{ => browser}/autocomplete_controller.h | 16 +- .../autocomplete_controller_delegate.h | 6 +- .../omnibox/{ => browser}/autocomplete_input.cc | 6 +- .../omnibox/{ => browser}/autocomplete_input.h | 6 +- .../{ => browser}/autocomplete_input_unittest.cc | 4 +- .../omnibox/{ => browser}/autocomplete_match.cc | 6 +- .../omnibox/{ => browser}/autocomplete_match.h | 10 +- .../{ => browser}/autocomplete_match_type.cc | 2 +- .../{ => browser}/autocomplete_match_type.h | 6 +- .../{ => browser}/autocomplete_match_unittest.cc | 4 +- .../omnibox/{ => browser}/autocomplete_provider.cc | 6 +- .../omnibox/{ => browser}/autocomplete_provider.h | 8 +- .../{ => browser}/autocomplete_provider_client.h | 10 +- .../{ => browser}/autocomplete_provider_listener.h | 6 +- .../omnibox/{ => browser}/autocomplete_result.cc | 12 +- .../omnibox/{ => browser}/autocomplete_result.h | 8 +- .../{ => browser}/autocomplete_result_unittest.cc | 14 +- .../{ => browser}/autocomplete_scheme_classifier.h | 6 +- .../omnibox/{ => browser}/base_search_provider.cc | 10 +- .../omnibox/{ => browser}/base_search_provider.h | 14 +- .../{ => browser}/base_search_provider_unittest.cc | 14 +- .../omnibox/{ => browser}/bookmark_provider.cc | 10 +- .../omnibox/{ => browser}/bookmark_provider.h | 12 +- .../omnibox/{ => browser}/builtin_provider.cc | 8 +- .../omnibox/{ => browser}/builtin_provider.h | 10 +- .../omnibox/{ => browser}/history_provider.cc | 8 +- .../omnibox/{ => browser}/history_provider.h | 12 +- .../{ => browser}/history_quick_provider.cc | 16 +- .../omnibox/{ => browser}/history_quick_provider.h | 14 +- .../omnibox/{ => browser}/history_url_provider.cc | 16 +- .../omnibox/{ => browser}/history_url_provider.h | 12 +- .../omnibox/{ => browser}/in_memory_url_index.cc | 4 +- .../omnibox/{ => browser}/in_memory_url_index.h | 8 +- .../{ => browser}/in_memory_url_index_cache.proto | 0 .../{ => browser}/in_memory_url_index_types.cc | 2 +- .../{ => browser}/in_memory_url_index_types.h | 6 +- .../in_memory_url_index_types_unittest.cc | 2 +- .../{ => browser}/keyword_extensions_delegate.cc | 2 +- .../{ => browser}/keyword_extensions_delegate.h | 6 +- .../omnibox/{ => browser}/keyword_provider.cc | 10 +- .../omnibox/{ => browser}/keyword_provider.h | 12 +- .../{ => browser}/keyword_provider_unittest.cc | 8 +- .../mock_autocomplete_provider_client.cc | 2 +- .../mock_autocomplete_provider_client.h | 8 +- .../omnibox/{ => browser}/omnibox_field_trial.cc | 4 +- .../omnibox/{ => browser}/omnibox_field_trial.h | 8 +- .../{ => browser}/omnibox_field_trial_unittest.cc | 2 +- components/omnibox/{ => browser}/omnibox_log.cc | 2 +- components/omnibox/{ => browser}/omnibox_log.h | 8 +- .../{ => browser}/omnibox_popup_model_observer.h | 6 +- .../omnibox/{ => browser}/omnibox_popup_view.h | 6 +- .../omnibox/{ => browser}/omnibox_pref_names.cc | 2 +- .../omnibox/{ => browser}/omnibox_pref_names.h | 6 +- .../omnibox/{ => browser}/omnibox_switches.cc | 2 +- .../omnibox/{ => browser}/omnibox_switches.h | 6 +- .../omnibox/{ => browser}/scored_history_match.cc | 8 +- .../omnibox/{ => browser}/scored_history_match.h | 8 +- .../{ => browser}/scored_history_match_unittest.cc | 2 +- .../omnibox/{ => browser}/search_provider.cc | 16 +- components/omnibox/{ => browser}/search_provider.h | 10 +- .../{ => browser}/search_suggestion_parser.cc | 6 +- .../{ => browser}/search_suggestion_parser.h | 12 +- .../omnibox/{ => browser}/shortcuts_backend.cc | 16 +- .../omnibox/{ => browser}/shortcuts_backend.h | 10 +- .../omnibox/{ => browser}/shortcuts_database.cc | 4 +- .../omnibox/{ => browser}/shortcuts_database.h | 6 +- .../omnibox/{ => browser}/shortcuts_provider.cc | 16 +- .../omnibox/{ => browser}/shortcuts_provider.h | 10 +- .../omnibox/{ => browser}/suggestion_answer.cc | 2 +- .../omnibox/{ => browser}/suggestion_answer.h | 6 +- .../{ => browser}/suggestion_answer_unittest.cc | 2 +- .../{ => browser}/test_scheme_classifier.cc | 2 +- .../omnibox/{ => browser}/test_scheme_classifier.h | 8 +- .../{ => browser}/url_index_private_data.cc | 4 +- .../omnibox/{ => browser}/url_index_private_data.h | 12 +- components/omnibox/{ => browser}/url_prefix.cc | 2 +- components/omnibox/{ => browser}/url_prefix.h | 6 +- .../omnibox/{ => browser}/zero_suggest_provider.cc | 18 +- .../omnibox/{ => browser}/zero_suggest_provider.h | 10 +- components/open_from_clipboard.gypi | 2 +- .../open_from_clipboard/clipboard_url_provider.cc | 2 +- .../open_from_clipboard/clipboard_url_provider.h | 2 +- 194 files changed, 729 insertions(+), 729 deletions(-) rewrite components/omnibox.gypi (63%) rename components/omnibox/{ => browser}/BUILD.gn (98%) rename components/omnibox/{ => browser}/DEPS (100%) rename components/omnibox/{ => browser}/answers_cache.cc (97%) rename components/omnibox/{ => browser}/answers_cache.h (88%) rename components/omnibox/{ => browser}/answers_cache_unittest.cc (98%) rename components/omnibox/{ => browser}/autocomplete_classifier.cc (87%) rename components/omnibox/{ => browser}/autocomplete_classifier.h (91%) rename components/omnibox/{ => browser}/autocomplete_controller.cc (97%) rename components/omnibox/{ => browser}/autocomplete_controller.h (95%) rename components/omnibox/{ => browser}/autocomplete_controller_delegate.h (70%) rename components/omnibox/{ => browser}/autocomplete_input.cc (99%) rename components/omnibox/{ => browser}/autocomplete_input.h (98%) rename components/omnibox/{ => browser}/autocomplete_input_unittest.cc (99%) rename components/omnibox/{ => browser}/autocomplete_match.cc (99%) rename components/omnibox/{ => browser}/autocomplete_match.h (98%) rename components/omnibox/{ => browser}/autocomplete_match_type.cc (93%) rename components/omnibox/{ => browser}/autocomplete_match_type.h (93%) rename components/omnibox/{ => browser}/autocomplete_match_unittest.cc (98%) rename components/omnibox/{ => browser}/autocomplete_provider.cc (97%) rename components/omnibox/{ => browser}/autocomplete_provider.h (98%) rename components/omnibox/{ => browser}/autocomplete_provider_client.h (93%) rename components/omnibox/{ => browser}/autocomplete_provider_listener.h (84%) rename components/omnibox/{ => browser}/autocomplete_result.cc (97%) rename components/omnibox/{ => browser}/autocomplete_result.h (96%) rename components/omnibox/{ => browser}/autocomplete_result_unittest.cc (98%) rename components/omnibox/{ => browser}/autocomplete_scheme_classifier.h (84%) rename components/omnibox/{ => browser}/base_search_provider.cc (98%) rename components/omnibox/{ => browser}/base_search_provider.h (96%) rename components/omnibox/{ => browser}/base_search_provider_unittest.cc (93%) rename components/omnibox/{ => browser}/bookmark_provider.cc (98%) rename components/omnibox/{ => browser}/bookmark_provider.h (89%) rename components/omnibox/{ => browser}/builtin_provider.cc (96%) rename components/omnibox/{ => browser}/builtin_provider.h (78%) rename components/omnibox/{ => browser}/history_provider.cc (93%) rename components/omnibox/{ => browser}/history_provider.h (81%) rename components/omnibox/{ => browser}/history_quick_provider.cc (96%) rename components/omnibox/{ => browser}/history_quick_provider.h (83%) rename components/omnibox/{ => browser}/history_url_provider.cc (99%) rename components/omnibox/{ => browser}/history_url_provider.h (97%) rename components/omnibox/{ => browser}/in_memory_url_index.cc (99%) rename components/omnibox/{ => browser}/in_memory_url_index.h (98%) rename components/omnibox/{ => browser}/in_memory_url_index_cache.proto (100%) rename components/omnibox/{ => browser}/in_memory_url_index_types.cc (98%) rename components/omnibox/{ => browser}/in_memory_url_index_types.h (97%) rename components/omnibox/{ => browser}/in_memory_url_index_types_unittest.cc (98%) rename components/omnibox/{ => browser}/keyword_extensions_delegate.cc (93%) rename components/omnibox/{ => browser}/keyword_extensions_delegate.h (90%) rename components/omnibox/{ => browser}/keyword_provider.cc (98%) rename components/omnibox/{ => browser}/keyword_provider.h (95%) rename components/omnibox/{ => browser}/keyword_provider_unittest.cc (98%) rename components/omnibox/{ => browser}/mock_autocomplete_provider_client.cc (80%) rename components/omnibox/{ => browser}/mock_autocomplete_provider_client.h (91%) rename components/omnibox/{ => browser}/omnibox_field_trial.cc (99%) rename components/omnibox/{ => browser}/omnibox_field_trial.h (98%) rename components/omnibox/{ => browser}/omnibox_field_trial_unittest.cc (99%) rename components/omnibox/{ => browser}/omnibox_log.cc (96%) rename components/omnibox/{ => browser}/omnibox_log.h (94%) rename components/omnibox/{ => browser}/omnibox_popup_model_observer.h (70%) rename components/omnibox/{ => browser}/omnibox_popup_view.h (90%) rename components/omnibox/{ => browser}/omnibox_pref_names.cc (85%) rename components/omnibox/{ => browser}/omnibox_pref_names.h (69%) rename components/omnibox/{ => browser}/omnibox_switches.cc (92%) rename components/omnibox/{ => browser}/omnibox_switches.h (68%) rename components/omnibox/{ => browser}/scored_history_match.cc (99%) rename components/omnibox/{ => browser}/scored_history_match.h (97%) rename components/omnibox/{ => browser}/scored_history_match_unittest.cc (99%) rename components/omnibox/{ => browser}/search_provider.cc (99%) rename components/omnibox/{ => browser}/search_provider.h (98%) rename components/omnibox/{ => browser}/search_suggestion_parser.cc (99%) rename components/omnibox/{ => browser}/search_suggestion_parser.h (96%) rename components/omnibox/{ => browser}/shortcuts_backend.cc (95%) rename components/omnibox/{ => browser}/shortcuts_backend.h (95%) rename components/omnibox/{ => browser}/shortcuts_database.cc (98%) rename components/omnibox/{ => browser}/shortcuts_database.h (96%) rename components/omnibox/{ => browser}/shortcuts_provider.cc (97%) rename components/omnibox/{ => browser}/shortcuts_provider.h (93%) rename components/omnibox/{ => browser}/suggestion_answer.cc (99%) rename components/omnibox/{ => browser}/suggestion_answer.h (96%) rename components/omnibox/{ => browser}/suggestion_answer_unittest.cc (99%) rename components/omnibox/{ => browser}/test_scheme_classifier.cc (94%) rename components/omnibox/{ => browser}/test_scheme_classifier.h (70%) rename components/omnibox/{ => browser}/url_index_private_data.cc (99%) rename components/omnibox/{ => browser}/url_index_private_data.h (97%) rename components/omnibox/{ => browser}/url_prefix.cc (98%) rename components/omnibox/{ => browser}/url_prefix.h (94%) rename components/omnibox/{ => browser}/zero_suggest_provider.cc (97%) rename components/omnibox/{ => browser}/zero_suggest_provider.h (95%) diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 20d3c18b1285..353cc37d5d3b 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -123,7 +123,7 @@ source_set("browser") { "//components/navigation_metrics", "//components/network_time", "//components/offline_pages", - "//components/omnibox", + "//components/omnibox/browser", "//components/os_crypt", "//components/packed_ct_ev_whitelist", "//components/password_manager/core/browser", diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 2e5036a0a40b..1f4302fe8dd6 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -30,7 +30,7 @@ #include "components/dom_distiller/core/dom_distiller_switches.h" #include "components/metrics/metrics_hashes.h" #include "components/nacl/common/nacl_switches.h" -#include "components/omnibox/omnibox_switches.h" +#include "components/omnibox/browser/omnibox_switches.h" #include "components/plugins/common/plugins_switches.h" #include "components/proximity_auth/switches.h" #include "components/search/search_switches.h" diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index 9570eb111390..fdea013ff9b0 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc @@ -32,14 +32,14 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_match_type.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/omnibox_log.h" -#include "components/omnibox/search_provider.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match_type.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_log.h" +#include "components/omnibox/browser/search_provider.h" #include "components/search/search.h" #include "components/search_engines/template_url_service.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.h b/chrome/browser/android/omnibox/autocomplete_controller_android.h index b77759743364..8ecd258eabc3 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.h +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.h @@ -14,8 +14,8 @@ #include "components/keyed_service/content/browser_context_keyed_service_factory.h" #include "components/keyed_service/core/keyed_service.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_controller_delegate.h" -#include "components/omnibox/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_controller_delegate.h" +#include "components/omnibox/browser/autocomplete_input.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/android/omnibox/omnibox_prerender.cc b/chrome/browser/android/omnibox/omnibox_prerender.cc index ee083aa39677..13069bfe4393 100644 --- a/chrome/browser/android/omnibox/omnibox_prerender.cc +++ b/chrome/browser/android/omnibox/omnibox_prerender.cc @@ -12,8 +12,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_android.h" #include "chrome/browser/ui/search/instant_search_prerenderer.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_result.h" #include "content/public/browser/web_contents.h" #include "jni/OmniboxPrerender_jni.h" #include "url/gurl.h" diff --git a/chrome/browser/autocomplete/autocomplete_browsertest.cc b/chrome/browser/autocomplete/autocomplete_browsertest.cc index 4848a821f796..545fa7034ba5 100644 --- a/chrome/browser/autocomplete/autocomplete_browsertest.cc +++ b/chrome/browser/autocomplete/autocomplete_browsertest.cc @@ -28,9 +28,9 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/history/core/browser/history_service.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc index bc43ca0905b8..5bd8e7ee5f1f 100644 --- a/chrome/browser/autocomplete/autocomplete_classifier_factory.cc +++ b/chrome/browser/autocomplete/autocomplete_classifier_factory.cc @@ -12,8 +12,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_controller.h" #if defined(ENABLE_EXTENSIONS) #include "extensions/browser/extension_system_provider.h" diff --git a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc b/chrome/browser/autocomplete/autocomplete_provider_unittest.cc index b2ae57598de7..68f80f653381 100644 --- a/chrome/browser/autocomplete/autocomplete_provider_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_provider_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 "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "base/bind.h" #include "base/command_line.h" @@ -21,12 +21,12 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/keyword_provider.h" -#include "components/omnibox/search_provider.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/keyword_provider.h" +#include "components/omnibox/browser/search_provider.h" #include "components/search_engines/search_engines_switches.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/autocomplete/bookmark_provider_unittest.cc b/chrome/browser/autocomplete/bookmark_provider_unittest.cc index 0e5cacc08298..7a5e5a40e840 100644 --- a/chrome/browser/autocomplete/bookmark_provider_unittest.cc +++ b/chrome/browser/autocomplete/bookmark_provider_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 "components/omnibox/bookmark_provider.h" +#include "components/omnibox/browser/bookmark_provider.h" #include #include @@ -21,7 +21,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/test/test_bookmark_client.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc index 2096852df597..906c6e02871d 100644 --- a/chrome/browser/autocomplete/builtin_provider_unittest.cc +++ b/chrome/browser/autocomplete/builtin_provider_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 "components/omnibox/builtin_provider.h" +#include "components/omnibox/browser/builtin_provider.h" #include "base/format_macros.h" #include "base/strings/stringprintf.h" @@ -12,9 +12,9 @@ #include "chrome/common/url_constants.h" #include "chrome/test/base/testing_profile.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/gurl.h" diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc index ff8885700e88..00c4c2852288 100644 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc @@ -22,7 +22,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "components/history/core/browser/history_service.h" -#include "components/omnibox/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_classifier.h" #include "content/public/browser/notification_service.h" #if defined(ENABLE_EXTENSIONS) diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h index 513b27ed527e..e8b218a5a301 100644 --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.h @@ -7,7 +7,7 @@ #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" -#include "components/omnibox/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" class Profile; diff --git a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h index a2f649613071..bb381b69be78 100644 --- a/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h +++ b/chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_AUTOCOMPLETE_CHROME_AUTOCOMPLETE_SCHEME_CLASSIFIER_H_ #include "base/macros.h" -#include "components/omnibox/autocomplete_scheme_classifier.h" +#include "components/omnibox/browser/autocomplete_scheme_classifier.h" class Profile; diff --git a/chrome/browser/autocomplete/history_quick_provider_unittest.cc b/chrome/browser/autocomplete/history_quick_provider_unittest.cc index 7be9b01e859e..21aec0fb1d33 100644 --- a/chrome/browser/autocomplete/history_quick_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_quick_provider_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 "components/omnibox/history_quick_provider.h" +#include "components/omnibox/browser/history_quick_provider.h" #include #include @@ -32,11 +32,11 @@ #include "components/history/core/browser/history_service_observer.h" #include "components/history/core/browser/url_database.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/history_url_provider.h" -#include "components/omnibox/in_memory_url_index.h" -#include "components/omnibox/url_index_private_data.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/history_url_provider.h" +#include "components/omnibox/browser/in_memory_url_index.h" +#include "components/omnibox/browser/url_index_private_data.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc index 5467a2a15ee2..67542dc1b94d 100644 --- a/chrome/browser/autocomplete/history_url_provider_unittest.cc +++ b/chrome/browser/autocomplete/history_url_provider_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 "components/omnibox/history_url_provider.h" +#include "components/omnibox/browser/history_url_provider.h" #include @@ -24,11 +24,11 @@ #include "components/history/core/browser/url_database.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/history_quick_provider.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/history_quick_provider.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" diff --git a/chrome/browser/autocomplete/in_memory_url_index_factory.cc b/chrome/browser/autocomplete/in_memory_url_index_factory.cc index 69a2fdc30712..ae2550f18e3d 100644 --- a/chrome/browser/autocomplete/in_memory_url_index_factory.cc +++ b/chrome/browser/autocomplete/in_memory_url_index_factory.cc @@ -13,7 +13,7 @@ #include "chrome/common/pref_names.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/core/service_access_type.h" -#include "components/omnibox/in_memory_url_index.h" +#include "components/omnibox/browser/in_memory_url_index.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/autocomplete/in_memory_url_index_unittest.cc b/chrome/browser/autocomplete/in_memory_url_index_unittest.cc index c4d97788cb2f..6f8da20b4aa3 100644 --- a/chrome/browser/autocomplete/in_memory_url_index_unittest.cc +++ b/chrome/browser/autocomplete/in_memory_url_index_unittest.cc @@ -26,9 +26,9 @@ #include "components/history/core/browser/history_backend.h" #include "components/history/core/browser/history_database.h" #include "components/history/core/browser/history_service.h" -#include "components/omnibox/in_memory_url_index.h" -#include "components/omnibox/in_memory_url_index_types.h" -#include "components/omnibox/url_index_private_data.h" +#include "components/omnibox/browser/in_memory_url_index.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" +#include "components/omnibox/browser/url_index_private_data.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "sql/transaction.h" diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h index cc415eb87f2f..047224fc6d47 100644 --- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h +++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl.h @@ -11,11 +11,11 @@ #include #include "base/compiler_specific.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/keyword_extensions_delegate.h" -#include "components/omnibox/keyword_provider.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/keyword_extensions_delegate.h" +#include "components/omnibox/browser/keyword_provider.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc index 0f4b715ad5fe..19ee544877b3 100644 --- a/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc +++ b/chrome/browser/autocomplete/keyword_extensions_delegate_impl_unittest.cc @@ -13,8 +13,8 @@ #include "chrome/browser/extensions/unpacked_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" -#include "components/omnibox/keyword_provider.h" -#include "components/omnibox/mock_autocomplete_provider_client.h" +#include "components/omnibox/browser/keyword_provider.h" +#include "components/omnibox/browser/mock_autocomplete_provider_client.h" #include "components/search_engines/template_url_service.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_observer.h" diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc index 2f752f1925a3..54e466307f13 100644 --- a/chrome/browser/autocomplete/search_provider_unittest.cc +++ b/chrome/browser/autocomplete/search_provider_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 "components/omnibox/search_provider.h" +#include "components/omnibox/browser/search_provider.h" #include @@ -32,15 +32,15 @@ #include "components/google/core/browser/google_switches.h" #include "components/history/core/browser/history_service.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/history_url_provider.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/omnibox_switches.h" -#include "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/history_url_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_switches.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "components/search_engines/search_engine_type.h" #include "components/search_engines/search_engines_switches.h" #include "components/search_engines/search_terms_data.h" diff --git a/chrome/browser/autocomplete/shortcuts_backend_factory.cc b/chrome/browser/autocomplete/shortcuts_backend_factory.cc index fd20c30fc5bb..3ed161011def 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_factory.cc +++ b/chrome/browser/autocomplete/shortcuts_backend_factory.cc @@ -13,7 +13,7 @@ #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "chrome/common/chrome_constants.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" -#include "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/shortcuts_backend.h" #include "content/public/browser/browser_thread.h" namespace { diff --git a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc b/chrome/browser/autocomplete/shortcuts_backend_unittest.cc index 433de7766e64..d01df8f47b7e 100644 --- a/chrome/browser/autocomplete/shortcuts_backend_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_backend_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 "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/shortcuts_backend.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop/message_loop.h" @@ -13,7 +13,7 @@ #include "chrome/browser/search_engines/ui_thread_search_terms_data.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/ui_test_utils.h" -#include "components/omnibox/shortcuts_database.h" +#include "components/omnibox/browser/shortcuts_database.h" #include "components/search_engines/template_url_service.h" #include "content/public/test/test_browser_thread.h" diff --git a/chrome/browser/autocomplete/shortcuts_database_unittest.cc b/chrome/browser/autocomplete/shortcuts_database_unittest.cc index cc68fdceb67e..63f81158865f 100644 --- a/chrome/browser/autocomplete/shortcuts_database_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_database_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 "components/omnibox/shortcuts_database.h" +#include "components/omnibox/browser/shortcuts_database.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" @@ -13,7 +13,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/test/base/testing_profile.h" -#include "components/omnibox/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_match_type.h" #include "content/public/test/test_browser_thread_bundle.h" #include "sql/statement.h" #include "sql/test/test_helpers.h" diff --git a/chrome/browser/autocomplete/shortcuts_extensions_manager.cc b/chrome/browser/autocomplete/shortcuts_extensions_manager.cc index e48d7259741a..aebc8d77d10e 100644 --- a/chrome/browser/autocomplete/shortcuts_extensions_manager.cc +++ b/chrome/browser/autocomplete/shortcuts_extensions_manager.cc @@ -7,7 +7,7 @@ #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/profiles/profile.h" -#include "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/shortcuts_backend.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" diff --git a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc b/chrome/browser/autocomplete/shortcuts_provider_unittest.cc index f8dbb761a2e5..01a1bbb5a579 100644 --- a/chrome/browser/autocomplete/shortcuts_provider_unittest.cc +++ b/chrome/browser/autocomplete/shortcuts_provider_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 "components/omnibox/shortcuts_provider.h" +#include "components/omnibox/browser/shortcuts_provider.h" #include @@ -24,12 +24,12 @@ #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/url_database.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/in_memory_url_index.h" -#include "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/in_memory_url_index.h" +#include "components/omnibox/browser/shortcuts_backend.h" #include "content/public/browser/notification_service.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc index d255040649c2..1f16d72993db 100644 --- a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc +++ b/chrome/browser/autocomplete/zero_suggest_provider_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 "components/omnibox/zero_suggest_provider.h" +#include "components/omnibox/browser/zero_suggest_provider.h" #include "base/metrics/field_trial.h" #include "base/prefs/pref_service.h" @@ -17,9 +17,9 @@ #include "chrome/test/base/testing_profile.h" #include "components/history/core/browser/top_sites.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/omnibox_pref_names.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_pref_names.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover.cc b/chrome/browser/browsing_data/browsing_data_remover.cc index 84f2eaf4897b..9f644d60c8b7 100644 --- a/chrome/browser/browsing_data/browsing_data_remover.cc +++ b/chrome/browser/browsing_data/browsing_data_remover.cc @@ -46,7 +46,7 @@ #include "components/history/core/browser/history_service.h" #include "components/nacl/browser/nacl_browser.h" #include "components/nacl/browser/pnacl_host.h" -#include "components/omnibox/omnibox_pref_names.h" +#include "components/omnibox/browser/omnibox_pref_names.h" #include "components/password_manager/core/browser/password_store.h" #include "components/power/origin_power_map.h" #include "components/power/origin_power_map_factory.h" diff --git a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc index 35fef465d3e4..8cabe2efa064 100644 --- a/chrome/browser/browsing_data/browsing_data_remover_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_remover_unittest.cc @@ -42,7 +42,7 @@ #include "components/domain_reliability/service.h" #include "components/favicon/core/favicon_service.h" #include "components/history/core/browser/history_service.h" -#include "components/omnibox/omnibox_pref_names.h" +#include "components/omnibox/browser/omnibox_pref_names.h" #include "content/public/browser/cookie_store_factory.h" #include "content/public/browser/dom_storage_context.h" #include "content/public/browser/local_storage_usage_info.h" diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc index 2a6a43296eba..17b59b017225 100644 --- a/chrome/browser/chrome_browser_field_trials.cc +++ b/chrome/browser/chrome_browser_field_trials.cc @@ -13,7 +13,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "components/metrics/metrics_pref_names.h" -#include "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #if defined(OS_ANDROID) || defined(OS_IOS) #include "chrome/browser/chrome_browser_field_trials_mobile.h" diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.h b/chrome/browser/extensions/api/omnibox/omnibox_api.h index 6db50e1f8927..24bfe626bc7c 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api.h @@ -14,7 +14,7 @@ #include "chrome/browser/extensions/chrome_extension_function.h" #include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/common/extensions/api/omnibox.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "components/search_engines/template_url_service.h" #include "extensions/browser/browser_context_keyed_api_factory.h" #include "extensions/browser/extension_registry_observer.h" diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc index c1fa66ed0cbf..f81c50c14dc2 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc +++ b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc @@ -13,10 +13,10 @@ #include "chrome/browser/ui/omnibox/omnibox_view.h" #include "chrome/test/base/ui_test_utils.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_result.h" #include "extensions/test/result_catcher.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h b/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h index 710910d93bf6..75601d5d1133 100644 --- a/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h +++ b/chrome/browser/extensions/api/omnibox/omnibox_api_testbase.h @@ -15,8 +15,8 @@ #include "chrome/browser/ui/location_bar/location_bar.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" #include "chrome/browser/ui/omnibox/omnibox_view.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_result.h" #include "content/public/test/test_utils.h" diff --git a/chrome/browser/metrics/omnibox_metrics_provider.cc b/chrome/browser/metrics/omnibox_metrics_provider.cc index 9ec1c2e32e5c..77db37b6c2fa 100644 --- a/chrome/browser/metrics/omnibox_metrics_provider.cc +++ b/chrome/browser/metrics/omnibox_metrics_provider.cc @@ -15,10 +15,10 @@ #include "components/metrics/metrics_log.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/omnibox_log.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/omnibox_log.h" #include "content/public/browser/notification_service.h" using metrics::OmniboxEventProto; diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index cc30765be038..8c20f2c76374 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -90,7 +90,7 @@ #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/infobars/core/infobar.h" -#include "components/omnibox/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_controller.h" #include "components/policy/core/browser/browser_policy_connector.h" #include "components/policy/core/common/external_data_fetcher.h" #include "components/policy/core/common/mock_configuration_policy_provider.h" diff --git a/chrome/browser/predictors/autocomplete_action_predictor.cc b/chrome/browser/predictors/autocomplete_action_predictor.cc index 15035b2a8caf..81aae16ba273 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor.cc @@ -28,9 +28,9 @@ #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/in_memory_database.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/omnibox_log.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/omnibox_log.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc index 8c223853cb46..ffa125753429 100644 --- a/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc +++ b/chrome/browser/predictors/autocomplete_action_predictor_unittest.cc @@ -19,7 +19,7 @@ #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/in_memory_database.h" #include "components/history/core/browser/url_database.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "content/public/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index b9eb3377b509..f544a2bbeebe 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -85,7 +85,7 @@ #include "components/enhanced_bookmarks/bookmark_server_cluster_service.h" #include "components/gcm_driver/gcm_channel_status_syncer.h" #include "components/network_time/network_time_tracker.h" -#include "components/omnibox/zero_suggest_provider.h" +#include "components/omnibox/browser/zero_suggest_provider.h" #include "components/password_manager/core/browser/password_manager.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/rappor/rappor_service.h" diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 410c4af36f27..4db6a3fccc49 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -86,8 +86,8 @@ #include "components/domain_reliability/service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/metrics/metrics_service.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/shortcuts_backend.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/signin_manager.h" #include "components/ui/zoom/zoom_event_manager.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index aab6d42c444a..766024d131d4 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -65,8 +65,8 @@ #include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h" #include "components/google/core/browser/google_util.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "components/password_manager/core/common/experiments.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc index 71d459b17942..94064d272b29 100644 --- a/chrome/browser/rlz/rlz.cc +++ b/chrome/browser/rlz/rlz.cc @@ -26,7 +26,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "components/google/core/browser/google_util.h" -#include "components/omnibox/omnibox_log.h" +#include "components/omnibox/browser/omnibox_log.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc index 9d10c9be3a14..8aeb09c81860 100644 --- a/chrome/browser/rlz/rlz_unittest.cc +++ b/chrome/browser/rlz/rlz_unittest.cc @@ -14,8 +14,8 @@ #include "chrome/installer/util/google_update_constants.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/omnibox_log.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/omnibox_log.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/search_engines/ui_thread_search_terms_data.cc b/chrome/browser/search_engines/ui_thread_search_terms_data.cc index f02d31fc9de7..1ccd09aac8b7 100644 --- a/chrome/browser/search_engines/ui_thread_search_terms_data.cc +++ b/chrome/browser/search_engines/ui_thread_search_terms_data.cc @@ -21,7 +21,7 @@ #include "chrome/common/chrome_version_info.h" #include "components/google/core/browser/google_url_tracker.h" #include "components/google/core/browser/google_util.h" -#include "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #include "components/search/search.h" #include "content/public/browser/browser_thread.h" #include "ui/base/device_form_factor.h" diff --git a/chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.cc b/chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.cc index a15051a066a4..b70f89dde0f3 100644 --- a/chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.cc +++ b/chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.cc @@ -8,7 +8,7 @@ #include "base/android/jni_string.h" #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" #include "chrome/browser/profiles/profile_android.h" -#include "components/omnibox/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_input.h" #include "jni/OmniboxUrlEmphasizer_jni.h" // static diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/browser/ui/app_list/search/omnibox_provider.cc index b3a2bb1561f1..2cf201394f02 100644 --- a/chrome/browser/ui/app_list/search/omnibox_provider.cc +++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc @@ -11,9 +11,9 @@ #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/app_list/search/omnibox_result.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_input.h" #include "ui/app_list/search_result.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.h b/chrome/browser/ui/app_list/search/omnibox_provider.h index df2dfdd4900c..17203b56e248 100644 --- a/chrome/browser/ui/app_list/search/omnibox_provider.h +++ b/chrome/browser/ui/app_list/search/omnibox_provider.h @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "components/omnibox/autocomplete_controller_delegate.h" +#include "components/omnibox/browser/autocomplete_controller_delegate.h" #include "ui/app_list/search_provider.h" class AppListControllerDelegate; diff --git a/chrome/browser/ui/app_list/search/omnibox_result.cc b/chrome/browser/ui/app_list/search/omnibox_result.cc index 565e8ed69f97..090419ed021f 100644 --- a/chrome/browser/ui/app_list/search/omnibox_result.cc +++ b/chrome/browser/ui/app_list/search/omnibox_result.cc @@ -10,8 +10,8 @@ #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" #include "chrome/browser/ui/app_list/search/search_util.h" #include "components/bookmarks/browser/bookmark_model.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_match_type.h" #include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/app_list/search/omnibox_result.h b/chrome/browser/ui/app_list/search/omnibox_result.h index 91ab5f642525..b0162bdc392a 100644 --- a/chrome/browser/ui/app_list/search/omnibox_result.h +++ b/chrome/browser/ui/app_list/search/omnibox_result.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_UI_APP_LIST_SEARCH_OMNIBOX_RESULT_H_ #include "base/memory/scoped_ptr.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "ui/app_list/search_result.h" class AppListControllerDelegate; diff --git a/chrome/browser/ui/app_list/search/omnibox_result_unittest.cc b/chrome/browser/ui/app_list/search/omnibox_result_unittest.cc index d3e70a6b8ba9..09d612471fb3 100644 --- a/chrome/browser/ui/app_list/search/omnibox_result_unittest.cc +++ b/chrome/browser/ui/app_list/search/omnibox_result_unittest.cc @@ -9,8 +9,8 @@ #include "chrome/browser/ui/app_list/app_list_test_util.h" #include "chrome/browser/ui/app_list/test/test_app_list_controller_delegate.h" #include "chrome/test/base/testing_profile.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match_type.h" #include "components/search_engines/template_url.h" namespace app_list { diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc index e4264d4f6c6d..f88dc9d43b74 100644 --- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc +++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc @@ -29,8 +29,8 @@ #include "components/app_modal/javascript_app_modal_dialog.h" #include "components/app_modal/native_app_modal_dialog.h" #include "components/content_settings/core/browser/host_content_settings_map.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_result.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_registrar.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h index 58c37318982d..34d69e76d152 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h @@ -8,7 +8,7 @@ #import #include "base/mac/scoped_nsobject.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" class OmniboxPopupViewMac; diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm index 52f637761f39..840de4691a54 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm @@ -18,7 +18,7 @@ #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" #include "chrome/grit/generated_resources.h" -#include "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "skia/ext/skia_utils_mac.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/font.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm index 511449aee7a6..ed1967c0f1c6 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm @@ -9,7 +9,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/suggestion_answer.h" #import "testing/gtest_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm index f7282457066f..d05c206571ba 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.mm @@ -9,7 +9,7 @@ #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h" #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_result.h" namespace { diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h index e1208b363785..df2027ba6dd9 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h @@ -11,8 +11,8 @@ #include "base/mac/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/omnibox_popup_view.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/omnibox_popup_view.h" #include "ui/gfx/font.h" class AutocompleteResult; diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm index cc422448a969..349843fcd3c0 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm @@ -15,8 +15,8 @@ #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match_type.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm index 9a74bc66bbd8..5bc6be2f36f4 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm @@ -10,7 +10,7 @@ #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "chrome/test/base/testing_profile.h" -#include "components/omnibox/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_input.h" #include "ui/gfx/font_list.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/text_elider.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm index a85eacefdd2e..b2ec7e580b1e 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm @@ -21,9 +21,9 @@ #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/grit/generated_resources.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #include "content/public/browser/web_contents.h" #include "extensions/common/constants.h" #import "third_party/mozilla/NSPasteboard+Utils.h" diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm index 7af59f76be73..27e2082bf783 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm @@ -10,7 +10,7 @@ #include "chrome/browser/ui/toolbar/toolbar_model_delegate.h" #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" #include "chrome/test/base/testing_profile.h" -#include "components/omnibox/omnibox_popup_view.h" +#include "components/omnibox/browser/omnibox_popup_view.h" #include "testing/platform_test.h" #include "ui/gfx/font.h" #include "ui/gfx/geometry/rect.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index d949d4146b32..3e37d703edf2 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -49,8 +49,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/grit/generated_resources.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "components/url_fixer/url_fixer.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 1a1c45512c99..33f77a8402c5 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -50,8 +50,8 @@ #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "components/search_engines/template_url_service.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/web_contents.h" diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc index 2a3d1ba8514c..b18c804adea9 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc +++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc @@ -12,7 +12,7 @@ #include "chrome/grit/generated_resources.h" #include "components/history/core/browser/history_service.h" #include "components/infobars/core/infobar.h" -#include "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/shortcuts_backend.h" #include "content/public/browser/web_contents.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h index 406b74316b0c..808c687e9ba1 100644 --- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h +++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h @@ -7,7 +7,7 @@ #include "base/memory/scoped_ptr.h" #include "components/infobars/core/infobar_delegate.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" class Profile; diff --git a/chrome/browser/ui/omnibox/omnibox_controller.cc b/chrome/browser/ui/omnibox/omnibox_controller.cc index 50bf227de989..18272c418510 100644 --- a/chrome/browser/ui/omnibox/omnibox_controller.cc +++ b/chrome/browser/ui/omnibox/omnibox_controller.cc @@ -20,10 +20,10 @@ #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" #include "chrome/common/instant_types.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/omnibox_popup_view.h" -#include "components/omnibox/search_provider.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/omnibox_popup_view.h" +#include "components/omnibox/browser/search_provider.h" #include "components/search/search.h" #include "extensions/common/constants.h" #include "ui/gfx/geometry/rect.h" diff --git a/chrome/browser/ui/omnibox/omnibox_controller.h b/chrome/browser/ui/omnibox/omnibox_controller.h index 6205a7da7285..a48ca9d80764 100644 --- a/chrome/browser/ui/omnibox/omnibox_controller.h +++ b/chrome/browser/ui/omnibox/omnibox_controller.h @@ -10,9 +10,9 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "chrome/browser/bitmap_fetcher/bitmap_fetcher_service.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_controller_delegate.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_controller_delegate.h" +#include "components/omnibox/browser/autocomplete_match.h" class AUtocompleteInput; struct AutocompleteMatch; diff --git a/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc b/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc index e6b65307bf04..bcb746a55305 100644 --- a/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc +++ b/chrome/browser/ui/omnibox/omnibox_controller_unittest.cc @@ -5,8 +5,8 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/ui/omnibox/omnibox_controller.h" #include "chrome/test/base/testing_profile.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc index d651d2e82b9b..cbc5383e88b6 100644 --- a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc +++ b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.cc @@ -15,7 +15,7 @@ #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/search/instant_search_prerenderer.h" #include "chrome/browser/ui/search/search_tab_helper.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "components/search/search.h" #include "components/search_engines/template_url_service.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index c6fbad5b59fa..b7bf70ac0a2f 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -50,14 +50,14 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/favicon/content/content_favicon_driver.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_match_type.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/history_url_provider.h" -#include "components/omnibox/keyword_provider.h" -#include "components/omnibox/omnibox_log.h" -#include "components/omnibox/omnibox_popup_view.h" -#include "components/omnibox/search_provider.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/history_url_provider.h" +#include "components/omnibox/browser/keyword_provider.h" +#include "components/omnibox/browser/omnibox_log.h" +#include "components/omnibox/browser/omnibox_popup_view.h" +#include "components/omnibox/browser/search_provider.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/search_engines/template_url_service.h" diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h index 2ddec68bf736..853f8573e1ca 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.h +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h @@ -14,9 +14,9 @@ #include "chrome/common/instant_types.h" #include "chrome/common/omnibox_focus_state.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_controller_delegate.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_controller_delegate.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/native_widget_types.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/omnibox/omnibox_navigation_observer.cc b/chrome/browser/ui/omnibox/omnibox_navigation_observer.cc index d6eb3eebc91e..90b458ab3a3c 100644 --- a/chrome/browser/ui/omnibox/omnibox_navigation_observer.cc +++ b/chrome/browser/ui/omnibox/omnibox_navigation_observer.cc @@ -8,7 +8,7 @@ #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h" -#include "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/shortcuts_backend.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_details.h" diff --git a/chrome/browser/ui/omnibox/omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/omnibox_navigation_observer.h index 3af9005b9b9a..2121312972c7 100644 --- a/chrome/browser/ui/omnibox/omnibox_navigation_observer.h +++ b/chrome/browser/ui/omnibox/omnibox_navigation_observer.h @@ -9,7 +9,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/web_contents_observer.h" diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.cc b/chrome/browser/ui/omnibox/omnibox_popup_model.cc index 362a9b7307a6..0ec4c2974676 100644 --- a/chrome/browser/ui/omnibox/omnibox_popup_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_popup_model.cc @@ -13,9 +13,9 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "components/bookmarks/browser/bookmark_model.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/omnibox_popup_model_observer.h" -#include "components/omnibox/omnibox_popup_view.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/omnibox_popup_model_observer.h" +#include "components/omnibox/browser/omnibox_popup_view.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "third_party/icu/source/common/unicode/ubidi.h" diff --git a/chrome/browser/ui/omnibox/omnibox_popup_model.h b/chrome/browser/ui/omnibox/omnibox_popup_model.h index af035cc02d42..3f8875f3330c 100644 --- a/chrome/browser/ui/omnibox/omnibox_popup_model.h +++ b/chrome/browser/ui/omnibox/omnibox_popup_model.h @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/observer_list.h" #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_result.h" #include "third_party/skia/include/core/SkBitmap.h" class OmniboxPopupModelObserver; diff --git a/chrome/browser/ui/omnibox/omnibox_view.cc b/chrome/browser/ui/omnibox/omnibox_view.cc index 7c6961413e07..4a8dd5c37192 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.cc +++ b/chrome/browser/ui/omnibox/omnibox_view.cc @@ -15,7 +15,7 @@ #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/grit/generated_resources.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "grit/components_scaled_resources.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view.h b/chrome/browser/ui/omnibox/omnibox_view.h index 9c55c3d81c02..4a980b2e3653 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.h +++ b/chrome/browser/ui/omnibox/omnibox_view.h @@ -17,7 +17,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "content/public/common/url_constants.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index a6f2e8ea557d..34b837bcad7f 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -35,9 +35,9 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/history_service_observer.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/history_quick_provider.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/history_quick_provider.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "content/public/browser/notification_service.h" diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc index f2c49f10ab05..f41690b9d941 100644 --- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc @@ -50,12 +50,12 @@ #include "components/history/core/browser/history_types.h" #include "components/history/core/browser/top_sites.h" #include "components/history/core/common/thumbnail_score.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/search_provider.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/search_provider.h" #include "components/search_engines/template_url_service.h" #include "components/sessions/serialized_navigation_entry.h" #include "content/public/browser/navigation_controller.h" diff --git a/chrome/browser/ui/search/instant_search_prerenderer.cc b/chrome/browser/ui/search/instant_search_prerenderer.cc index 69bb402f7138..e9e4cf827928 100644 --- a/chrome/browser/ui/search/instant_search_prerenderer.cc +++ b/chrome/browser/ui/search/instant_search_prerenderer.cc @@ -14,7 +14,7 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/search/search_tab_helper.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "components/search_engines/template_url_service.h" namespace { diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc index 07d73ab75c7f..11db5edbd25e 100644 --- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc +++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc @@ -26,7 +26,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/instant_types.h" #include "chrome/common/render_messages.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/common/url_constants.h" diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc index 26c31fc71bef..6a17942f731e 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc @@ -17,9 +17,9 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" #include "components/google/core/browser/google_util.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "content/public/browser/cert_store.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index 5bfb080d5a13..13125e58f456 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc @@ -14,8 +14,8 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/touch_uma/touch_uma.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/hit_test.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 860015056c25..3ef16db6566e 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -107,7 +107,7 @@ #include "components/app_modal/app_modal_dialog.h" #include "components/app_modal/app_modal_dialog_queue.h" #include "components/app_modal/native_app_modal_dialog.h" -#include "components/omnibox/omnibox_popup_view.h" +#include "components/omnibox/browser/omnibox_popup_view.h" #include "components/signin/core/common/profile_management_switches.h" #include "components/translate/core/browser/language_state.h" #include "content/app/resources/grit/content_resources.h" diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h index 506670a94b7e..d90d0deb845d 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -26,7 +26,7 @@ #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" #include "chrome/browser/ui/views/frame/web_contents_close_handler.h" #include "chrome/browser/ui/views/load_complete_listener.h" -#include "components/omnibox/omnibox_popup_model_observer.h" +#include "components/omnibox/browser/omnibox_popup_model_observer.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/native_widget_types.h" diff --git a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc index e39e70908add..4c3298065f22 100644 --- a/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/frame/browser_view_interactive_uitest.cc @@ -19,7 +19,7 @@ #include "chrome/common/instant_types.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" -#include "components/omnibox/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_controller.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/focus/focus_manager.h" #include "ui/views/window/non_client_view.h" diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.cc b/chrome/browser/ui/views/frame/test_with_browser_view.cc index c866f231c0f6..0867c920d390 100644 --- a/chrome/browser/ui/views/frame/test_with_browser_view.cc +++ b/chrome/browser/ui/views/frame/test_with_browser_view.cc @@ -18,9 +18,9 @@ #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_io_thread_state.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/test_scheme_classifier.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/test_scheme_classifier.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url_service.h" #include "content/public/test/test_utils.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 c6d2be4b1aec..ede1d761ed54 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -57,7 +57,7 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/favicon/content/content_favicon_driver.h" -#include "components/omnibox/omnibox_popup_view.h" +#include "components/omnibox/browser/omnibox_popup_view.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "components/translate/core/browser/language_state.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h index fe72e0c2f758..c935c5c99bd2 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h +++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h @@ -7,7 +7,7 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" -#include "components/omnibox/omnibox_popup_view.h" +#include "components/omnibox/browser/omnibox_popup_view.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.h b/chrome/browser/ui/views/omnibox/omnibox_result_view.h index 0bd909fb5ee5..d2703d82efa4 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.h +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.h @@ -8,8 +8,8 @@ #include #include "base/gtest_prod_util.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/gfx/animation/animation_delegate.h" #include "ui/gfx/animation/slide_animation.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index f9e68d42b71f..2412748ab2fd 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -24,9 +24,9 @@ #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" #include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_node_data.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #include "content/public/browser/web_contents.h" #include "extensions/common/constants.h" #include "net/base/escape.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 410661a09d2c..f5015041e28d 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -30,8 +30,8 @@ #include "components/favicon/content/content_favicon_driver.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/mime_util/mime_util.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/plugin_service.h" diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc index bedce9bf27a6..ec18ff9549cc 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc @@ -23,10 +23,10 @@ #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/url_database.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "components/search_engines/template_url.h" #include "content/public/browser/web_ui.h" #include "mojo/common/common_type_converters.h" diff --git a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h index f356f47b5bd8..a8e4ed7522eb 100644 --- a/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h +++ b/chrome/browser/ui/webui/omnibox/omnibox_ui_handler.h @@ -11,9 +11,9 @@ #include "base/time/time.h" #include "chrome/browser/ui/webui/mojo_web_ui_handler.h" #include "chrome/browser/ui/webui/omnibox/omnibox.mojom.h" -#include "components/omnibox/autocomplete_controller_delegate.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_controller_delegate.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" class AutocompleteController; diff --git a/chrome/browser/ui/webui/options/home_page_overlay_handler.cc b/chrome/browser/ui/webui/options/home_page_overlay_handler.cc index e918fee0d3ab..727305134635 100644 --- a/chrome/browser/ui/webui/options/home_page_overlay_handler.cc +++ b/chrome/browser/ui/webui/options/home_page_overlay_handler.cc @@ -13,10 +13,10 @@ #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/grit/generated_resources.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_result.h" #include "content/public/browser/web_ui.h" namespace options { diff --git a/chrome/browser/ui/webui/options/home_page_overlay_handler.h b/chrome/browser/ui/webui/options/home_page_overlay_handler.h index cc070315f7f3..36fce27461d2 100644 --- a/chrome/browser/ui/webui/options/home_page_overlay_handler.h +++ b/chrome/browser/ui/webui/options/home_page_overlay_handler.h @@ -9,7 +9,7 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/ui/webui/options/options_ui.h" -#include "components/omnibox/autocomplete_controller_delegate.h" +#include "components/omnibox/browser/autocomplete_controller_delegate.h" class AutocompleteController; diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 5a5bc3963676..e69c1990c2f6 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -50,8 +50,8 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" #include "chrome/grit/locale_settings.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_result.h" #include "content/public/browser/notification_types.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/url_data_source.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.cc b/chrome/browser/ui/webui/options/startup_pages_handler.cc index 0838d30cd59d..c8ebc9aa2fa7 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.cc +++ b/chrome/browser/ui/webui/options/startup_pages_handler.cc @@ -17,10 +17,10 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_result.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/web_ui.h" diff --git a/chrome/browser/ui/webui/options/startup_pages_handler.h b/chrome/browser/ui/webui/options/startup_pages_handler.h index b17ed99a32fd..dbf0a94d7e45 100644 --- a/chrome/browser/ui/webui/options/startup_pages_handler.h +++ b/chrome/browser/ui/webui/options/startup_pages_handler.h @@ -11,7 +11,7 @@ #include "base/prefs/pref_change_registrar.h" #include "base/prefs/pref_member.h" #include "chrome/browser/ui/webui/options/options_ui.h" -#include "components/omnibox/autocomplete_controller_delegate.h" +#include "components/omnibox/browser/autocomplete_controller_delegate.h" #include "ui/base/models/table_model_observer.h" class AutocompleteController; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 78beb42b8802..9e608e6b1b42 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3170,7 +3170,7 @@ '../components/components.gyp:navigation_metrics', '../components/components.gyp:network_time', '../components/components.gyp:offline_pages', - '../components/components.gyp:omnibox', + '../components/components.gyp:omnibox_browser', '../components/components.gyp:os_crypt', '../components/components.gyp:password_manager_core_browser', '../components/components.gyp:password_manager_core_common', diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index e629c8438c32..c77d5eb2f6b7 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -100,7 +100,7 @@ source_set("test_support") { "//components/gcm_driver/instance_id:test_support", "//components/history/core/test:test", "//components/metrics:test_support", - "//components/omnibox:test_support", + "//components/omnibox/browser:test_support", "//components/password_manager/core/browser:test_support", "//components/pref_registry:test_support", "//components/rappor:test_support", diff --git a/chrome/test/base/history_index_restore_observer.h b/chrome/test/base/history_index_restore_observer.h index d15f0663b808..1eea1c733aab 100644 --- a/chrome/test/base/history_index_restore_observer.h +++ b/chrome/test/base/history_index_restore_observer.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/compiler_specific.h" -#include "components/omnibox/in_memory_url_index.h" +#include "components/omnibox/browser/in_memory_url_index.h" // HistoryIndexRestoreObserver is used when blocking until the InMemoryURLIndex // finishes restoring. As soon as the InMemoryURLIndex finishes restoring the diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc index 9e510e7eda36..c1badfb49a63 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc @@ -63,8 +63,8 @@ #include "components/history/core/browser/history_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/keyed_service/core/refcounted_keyed_service.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/in_memory_url_index.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/in_memory_url_index.h" #include "components/policy/core/common/policy_service.h" #include "components/ui/zoom/zoom_event_manager.h" #include "components/user_prefs/user_prefs.h" diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc index 76e231ffea83..552a1183a256 100644 --- a/chrome/test/base/ui_test_utils.cc +++ b/chrome/test/base/ui_test_utils.cc @@ -46,7 +46,7 @@ #include "components/app_modal/app_modal_dialog_queue.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/history/core/browser/history_service_observer.h" -#include "components/omnibox/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_controller.h" #include "components/search_engines/template_url_service.h" #include "content/public/browser/dom_operation_notification_details.h" #include "content/public/browser/download_item.h" diff --git a/components/BUILD.gn b/components/BUILD.gn index 8c4c3a7131cd..9f2dffc3ea68 100644 --- a/components/BUILD.gn +++ b/components/BUILD.gn @@ -65,7 +65,7 @@ group("all_components") { "//components/navigation_metrics", "//components/network_time", "//components/offline_pages", - "//components/omnibox", + "//components/omnibox/browser", "//components/onc", "//components/os_crypt", "//components/packed_ct_ev_whitelist", @@ -201,7 +201,7 @@ group("all_components") { "//components/json_schema", # Should work, needs checking. "//components/keyed_service/content", # Blocked on content. "//components/navigation_interception", # Blocked on content. - "//components/omnibox", # Should work, needs checking. + "//components/omnibox/browser", # Should work, needs checking. "//components/password_manager/content/browser", # Blocked on content. "//components/password_manager/core/browser", # Should work, needs checking. "//components/password_manager/core/common", # Should work, needs checking. @@ -293,7 +293,7 @@ test("components_unittests") { "//components/metrics:unit_tests", "//components/mime_util:unit_tests", "//components/offline_pages:unit_tests", - "//components/omnibox:unit_tests", + "//components/omnibox/browser:unit_tests", "//components/packed_ct_ev_whitelist:unit_tests", "//components/undo:unit_tests", "//components/update_client:unit_tests", diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 0ba8935a2013..4dd484687bf0 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -340,16 +340,16 @@ 'offline_pages/offline_page_model_unittest.cc', ], 'omnibox_unittest_sources': [ - 'omnibox/answers_cache_unittest.cc', - 'omnibox/autocomplete_input_unittest.cc', - 'omnibox/autocomplete_match_unittest.cc', - 'omnibox/autocomplete_result_unittest.cc', - 'omnibox/base_search_provider_unittest.cc', - 'omnibox/in_memory_url_index_types_unittest.cc', - 'omnibox/keyword_provider_unittest.cc', - 'omnibox/omnibox_field_trial_unittest.cc', - 'omnibox/scored_history_match_unittest.cc', - 'omnibox/suggestion_answer_unittest.cc', + 'omnibox/browser/answers_cache_unittest.cc', + 'omnibox/browser/autocomplete_input_unittest.cc', + 'omnibox/browser/autocomplete_match_unittest.cc', + 'omnibox/browser/autocomplete_result_unittest.cc', + 'omnibox/browser/base_search_provider_unittest.cc', + 'omnibox/browser/in_memory_url_index_types_unittest.cc', + 'omnibox/browser/keyword_provider_unittest.cc', + 'omnibox/browser/omnibox_field_trial_unittest.cc', + 'omnibox/browser/scored_history_match_unittest.cc', + 'omnibox/browser/suggestion_answer_unittest.cc', ], 'os_crypt_unittest_sources': [ 'os_crypt/ie7_password_win_unittest.cc', @@ -823,7 +823,7 @@ 'components.gyp:metrics_test_support', 'components.gyp:network_time', 'components.gyp:offline_pages', - 'components.gyp:omnibox', + 'components.gyp:omnibox_browser', 'components.gyp:omnibox_test_support', 'components.gyp:os_crypt', 'components.gyp:packed_ct_ev_whitelist', diff --git a/components/omnibox.gypi b/components/omnibox.gypi dissimilarity index 63% index 955797e75d40..0442d46a6f4b 100644 --- a/components/omnibox.gypi +++ b/components/omnibox.gypi @@ -1,149 +1,149 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //components/omnibox - 'target_name': 'omnibox', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', - '../net/net.gyp:net', - '../sql/sql.gyp:sql', - '../third_party/protobuf/protobuf.gyp:protobuf_lite', - '../ui/base/ui_base.gyp:ui_base', - '../url/url.gyp:url_lib', - 'bookmarks_browser', - 'component_metrics_proto', - 'components_resources.gyp:components_resources', - 'components_strings.gyp:components_strings', - 'history_core_browser', - 'keyed_service_core', - 'omnibox_in_memory_url_index_cache_proto', - 'pref_registry', - 'query_parser', - 'search', - 'search_engines', - 'url_fixer', - 'variations_http_provider', - ], - 'export_dependent_settings': [ - 'component_metrics_proto', - 'history_core_browser', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'omnibox/answers_cache.cc', - 'omnibox/answers_cache.h', - 'omnibox/autocomplete_classifier.cc', - 'omnibox/autocomplete_classifier.h', - 'omnibox/autocomplete_controller.cc', - 'omnibox/autocomplete_controller.h', - 'omnibox/autocomplete_controller_delegate.h', - 'omnibox/autocomplete_input.cc', - 'omnibox/autocomplete_input.h', - 'omnibox/autocomplete_match.cc', - 'omnibox/autocomplete_match.h', - 'omnibox/autocomplete_match_type.cc', - 'omnibox/autocomplete_match_type.h', - 'omnibox/autocomplete_provider.cc', - 'omnibox/autocomplete_provider.h', - 'omnibox/autocomplete_provider_client.h', - 'omnibox/autocomplete_provider_listener.h', - 'omnibox/autocomplete_result.cc', - 'omnibox/autocomplete_result.h', - 'omnibox/autocomplete_scheme_classifier.h', - 'omnibox/base_search_provider.cc', - 'omnibox/base_search_provider.h', - 'omnibox/bookmark_provider.cc', - 'omnibox/bookmark_provider.h', - 'omnibox/builtin_provider.cc', - 'omnibox/builtin_provider.h', - 'omnibox/history_provider.cc', - 'omnibox/history_provider.h', - 'omnibox/history_quick_provider.cc', - 'omnibox/history_quick_provider.h', - 'omnibox/history_url_provider.cc', - 'omnibox/history_url_provider.h', - 'omnibox/in_memory_url_index.cc', - 'omnibox/in_memory_url_index.h', - 'omnibox/in_memory_url_index_types.cc', - 'omnibox/in_memory_url_index_types.h', - 'omnibox/keyword_extensions_delegate.cc', - 'omnibox/keyword_extensions_delegate.h', - 'omnibox/keyword_provider.cc', - 'omnibox/keyword_provider.h', - 'omnibox/omnibox_field_trial.cc', - 'omnibox/omnibox_field_trial.h', - 'omnibox/omnibox_log.cc', - 'omnibox/omnibox_log.h', - 'omnibox/omnibox_popup_model_observer.h', - 'omnibox/omnibox_popup_view.h', - 'omnibox/omnibox_pref_names.cc', - 'omnibox/omnibox_pref_names.h', - 'omnibox/omnibox_switches.cc', - 'omnibox/omnibox_switches.h', - 'omnibox/scored_history_match.cc', - 'omnibox/scored_history_match.h', - 'omnibox/search_provider.cc', - 'omnibox/search_provider.h', - 'omnibox/search_suggestion_parser.cc', - 'omnibox/search_suggestion_parser.h', - 'omnibox/shortcuts_backend.cc', - 'omnibox/shortcuts_backend.h', - 'omnibox/shortcuts_database.cc', - 'omnibox/shortcuts_database.h', - 'omnibox/shortcuts_provider.cc', - 'omnibox/shortcuts_provider.h', - 'omnibox/suggestion_answer.cc', - 'omnibox/suggestion_answer.h', - 'omnibox/url_index_private_data.cc', - 'omnibox/url_index_private_data.h', - 'omnibox/url_prefix.cc', - 'omnibox/url_prefix.h', - 'omnibox/zero_suggest_provider.cc', - 'omnibox/zero_suggest_provider.h', - ], - }, - { - # Protobuf compiler / generator for the InMemoryURLIndex caching - # protocol buffer. - # GN version: //components/omnibox:in_memory_url_index_cache_proto - 'target_name': 'omnibox_in_memory_url_index_cache_proto', - 'type': 'static_library', - 'sources': [ 'omnibox/in_memory_url_index_cache.proto', ], - 'variables': { - 'proto_in_dir': 'omnibox', - 'proto_out_dir': 'components/omnibox', - }, - 'includes': [ '../build/protoc.gypi', ], - }, - { - # GN version: //components/omnibox:test_support - 'target_name': 'omnibox_test_support', - 'type': 'static_library', - 'dependencies': [ - '../base/base.gyp:base', - '../testing/gmock.gyp:gmock', - 'omnibox', - 'component_metrics_proto', - ], - 'include_dirs': [ - '..', - ], - 'sources': [ - # Note: sources list duplicated in GN build. - 'omnibox/mock_autocomplete_provider_client.cc', - 'omnibox/mock_autocomplete_provider_client.h', - 'omnibox/test_scheme_classifier.cc', - 'omnibox/test_scheme_classifier.h', - ], - }, - ], -} +# Copyright 2014 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. + +{ + 'targets': [ + { + # GN version: //components/omnibox/browser + 'target_name': 'omnibox_browser', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:base', + '../base/base.gyp:base_i18n', + '../net/net.gyp:net', + '../sql/sql.gyp:sql', + '../third_party/protobuf/protobuf.gyp:protobuf_lite', + '../ui/base/ui_base.gyp:ui_base', + '../url/url.gyp:url_lib', + 'bookmarks_browser', + 'component_metrics_proto', + 'components_resources.gyp:components_resources', + 'components_strings.gyp:components_strings', + 'history_core_browser', + 'keyed_service_core', + 'omnibox_in_memory_url_index_cache_proto', + 'pref_registry', + 'query_parser', + 'search', + 'search_engines', + 'url_fixer', + 'variations_http_provider', + ], + 'export_dependent_settings': [ + 'component_metrics_proto', + 'history_core_browser', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + # Note: sources list duplicated in GN build. + 'omnibox/browser/answers_cache.cc', + 'omnibox/browser/answers_cache.h', + 'omnibox/browser/autocomplete_classifier.cc', + 'omnibox/browser/autocomplete_classifier.h', + 'omnibox/browser/autocomplete_controller.cc', + 'omnibox/browser/autocomplete_controller.h', + 'omnibox/browser/autocomplete_controller_delegate.h', + 'omnibox/browser/autocomplete_input.cc', + 'omnibox/browser/autocomplete_input.h', + 'omnibox/browser/autocomplete_match.cc', + 'omnibox/browser/autocomplete_match.h', + 'omnibox/browser/autocomplete_match_type.cc', + 'omnibox/browser/autocomplete_match_type.h', + 'omnibox/browser/autocomplete_provider.cc', + 'omnibox/browser/autocomplete_provider.h', + 'omnibox/browser/autocomplete_provider_client.h', + 'omnibox/browser/autocomplete_provider_listener.h', + 'omnibox/browser/autocomplete_result.cc', + 'omnibox/browser/autocomplete_result.h', + 'omnibox/browser/autocomplete_scheme_classifier.h', + 'omnibox/browser/base_search_provider.cc', + 'omnibox/browser/base_search_provider.h', + 'omnibox/browser/bookmark_provider.cc', + 'omnibox/browser/bookmark_provider.h', + 'omnibox/browser/builtin_provider.cc', + 'omnibox/browser/builtin_provider.h', + 'omnibox/browser/history_provider.cc', + 'omnibox/browser/history_provider.h', + 'omnibox/browser/history_quick_provider.cc', + 'omnibox/browser/history_quick_provider.h', + 'omnibox/browser/history_url_provider.cc', + 'omnibox/browser/history_url_provider.h', + 'omnibox/browser/in_memory_url_index.cc', + 'omnibox/browser/in_memory_url_index.h', + 'omnibox/browser/in_memory_url_index_types.cc', + 'omnibox/browser/in_memory_url_index_types.h', + 'omnibox/browser/keyword_extensions_delegate.cc', + 'omnibox/browser/keyword_extensions_delegate.h', + 'omnibox/browser/keyword_provider.cc', + 'omnibox/browser/keyword_provider.h', + 'omnibox/browser/omnibox_field_trial.cc', + 'omnibox/browser/omnibox_field_trial.h', + 'omnibox/browser/omnibox_log.cc', + 'omnibox/browser/omnibox_log.h', + 'omnibox/browser/omnibox_popup_model_observer.h', + 'omnibox/browser/omnibox_popup_view.h', + 'omnibox/browser/omnibox_pref_names.cc', + 'omnibox/browser/omnibox_pref_names.h', + 'omnibox/browser/omnibox_switches.cc', + 'omnibox/browser/omnibox_switches.h', + 'omnibox/browser/scored_history_match.cc', + 'omnibox/browser/scored_history_match.h', + 'omnibox/browser/search_provider.cc', + 'omnibox/browser/search_provider.h', + 'omnibox/browser/search_suggestion_parser.cc', + 'omnibox/browser/search_suggestion_parser.h', + 'omnibox/browser/shortcuts_backend.cc', + 'omnibox/browser/shortcuts_backend.h', + 'omnibox/browser/shortcuts_database.cc', + 'omnibox/browser/shortcuts_database.h', + 'omnibox/browser/shortcuts_provider.cc', + 'omnibox/browser/shortcuts_provider.h', + 'omnibox/browser/suggestion_answer.cc', + 'omnibox/browser/suggestion_answer.h', + 'omnibox/browser/url_index_private_data.cc', + 'omnibox/browser/url_index_private_data.h', + 'omnibox/browser/url_prefix.cc', + 'omnibox/browser/url_prefix.h', + 'omnibox/browser/zero_suggest_provider.cc', + 'omnibox/browser/zero_suggest_provider.h', + ], + }, + { + # Protobuf compiler / generator for the InMemoryURLIndex caching + # protocol buffer. + # GN version: //components/omnibox:in_memory_url_index_cache_proto + 'target_name': 'omnibox_in_memory_url_index_cache_proto', + 'type': 'static_library', + 'sources': [ 'omnibox/browser/in_memory_url_index_cache.proto', ], + 'variables': { + 'proto_in_dir': 'omnibox/browser', + 'proto_out_dir': 'components/omnibox/browser', + }, + 'includes': [ '../build/protoc.gypi', ], + }, + { + # GN version: //components/omnibox:test_support + 'target_name': 'omnibox_test_support', + 'type': 'static_library', + 'dependencies': [ + '../base/base.gyp:base', + '../testing/gmock.gyp:gmock', + 'omnibox_browser', + 'component_metrics_proto', + ], + 'include_dirs': [ + '..', + ], + 'sources': [ + # Note: sources list duplicated in GN build. + 'omnibox/browser/mock_autocomplete_provider_client.cc', + 'omnibox/browser/mock_autocomplete_provider_client.h', + 'omnibox/browser/test_scheme_classifier.cc', + 'omnibox/browser/test_scheme_classifier.h', + ], + }, + ], +} diff --git a/components/omnibox/BUILD.gn b/components/omnibox/browser/BUILD.gn similarity index 98% rename from components/omnibox/BUILD.gn rename to components/omnibox/browser/BUILD.gn index a8ad942042b3..a801e7013ba1 100644 --- a/components/omnibox/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -4,7 +4,7 @@ import("//third_party/protobuf/proto_library.gni") -static_library("omnibox") { +source_set("browser") { sources = [ "answers_cache.cc", "answers_cache.h", @@ -119,7 +119,7 @@ static_library("test_support") { ] deps = [ - ":omnibox", + ":browser", "//base", "//components/metrics/proto", "//testing/gmock", @@ -142,7 +142,7 @@ source_set("unit_tests") { ] deps = [ - ":omnibox", + ":browser", ":test_support", "//testing/gmock", "//testing/gtest", diff --git a/components/omnibox/DEPS b/components/omnibox/browser/DEPS similarity index 100% rename from components/omnibox/DEPS rename to components/omnibox/browser/DEPS diff --git a/components/omnibox/answers_cache.cc b/components/omnibox/browser/answers_cache.cc similarity index 97% rename from components/omnibox/answers_cache.cc rename to components/omnibox/browser/answers_cache.cc index 3ea8a1f405bc..bc4e0b81b259 100644 --- a/components/omnibox/answers_cache.cc +++ b/components/omnibox/browser/answers_cache.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 "components/omnibox/answers_cache.h" +#include "components/omnibox/browser/answers_cache.h" #include "base/i18n/case_conversion.h" #include "base/strings/string_util.h" diff --git a/components/omnibox/answers_cache.h b/components/omnibox/browser/answers_cache.h similarity index 88% rename from components/omnibox/answers_cache.h rename to components/omnibox/browser/answers_cache.h index 688143e358bf..e0be2381ed46 100644 --- a/components/omnibox/answers_cache.h +++ b/components/omnibox/browser/answers_cache.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 COMPONENTS_OMNIBOX_ANSWERS_CACHE_H_ -#define COMPONENTS_OMNIBOX_ANSWERS_CACHE_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_ANSWERS_CACHE_H_ +#define COMPONENTS_OMNIBOX_BROWSER_ANSWERS_CACHE_H_ #include @@ -43,4 +43,4 @@ class AnswersCache { DISALLOW_COPY_AND_ASSIGN(AnswersCache); }; -#endif // COMPONENTS_OMNIBOX_ANSWERS_CACHE_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_ANSWERS_CACHE_H_ diff --git a/components/omnibox/answers_cache_unittest.cc b/components/omnibox/browser/answers_cache_unittest.cc similarity index 98% rename from components/omnibox/answers_cache_unittest.cc rename to components/omnibox/browser/answers_cache_unittest.cc index e2f42b8f871d..14fd030a1c7c 100644 --- a/components/omnibox/answers_cache_unittest.cc +++ b/components/omnibox/browser/answers_cache_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 "components/omnibox/answers_cache.h" +#include "components/omnibox/browser/answers_cache.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/omnibox/autocomplete_classifier.cc b/components/omnibox/browser/autocomplete_classifier.cc similarity index 87% rename from components/omnibox/autocomplete_classifier.cc rename to components/omnibox/browser/autocomplete_classifier.cc index fa62150651c3..33002d74d002 100644 --- a/components/omnibox/autocomplete_classifier.cc +++ b/components/omnibox/browser/autocomplete_classifier.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_classifier.h" #include "base/auto_reset.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_controller.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "url/gurl.h" // static diff --git a/components/omnibox/autocomplete_classifier.h b/components/omnibox/browser/autocomplete_classifier.h similarity index 91% rename from components/omnibox/autocomplete_classifier.h rename to components/omnibox/browser/autocomplete_classifier.h index a1c952712ab7..aca4e06fc74c 100644 --- a/components/omnibox/autocomplete_classifier.h +++ b/components/omnibox/browser/autocomplete_classifier.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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_CLASSIFIER_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_CLASSIFIER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CLASSIFIER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CLASSIFIER_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -11,7 +11,7 @@ #include "base/strings/string16.h" #include "components/keyed_service/core/keyed_service.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_scheme_classifier.h" +#include "components/omnibox/browser/autocomplete_scheme_classifier.h" class AutocompleteController; struct AutocompleteMatch; @@ -67,4 +67,4 @@ class AutocompleteClassifier : public KeyedService { DISALLOW_IMPLICIT_CONSTRUCTORS(AutocompleteClassifier); }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_CLASSIFIER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CLASSIFIER_H_ diff --git a/components/omnibox/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc similarity index 97% rename from components/omnibox/autocomplete_controller.cc rename to components/omnibox/browser/autocomplete_controller.cc index 1a95519bcf9b..b4f5b9c120c3 100644 --- a/components/omnibox/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/autocomplete_controller.h" +#include "components/omnibox/browser/autocomplete_controller.h" #include #include @@ -13,16 +13,16 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" -#include "components/omnibox/autocomplete_controller_delegate.h" -#include "components/omnibox/bookmark_provider.h" -#include "components/omnibox/builtin_provider.h" -#include "components/omnibox/history_quick_provider.h" -#include "components/omnibox/history_url_provider.h" -#include "components/omnibox/keyword_provider.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/search_provider.h" -#include "components/omnibox/shortcuts_provider.h" -#include "components/omnibox/zero_suggest_provider.h" +#include "components/omnibox/browser/autocomplete_controller_delegate.h" +#include "components/omnibox/browser/bookmark_provider.h" +#include "components/omnibox/browser/builtin_provider.h" +#include "components/omnibox/browser/history_quick_provider.h" +#include "components/omnibox/browser/history_url_provider.h" +#include "components/omnibox/browser/keyword_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/search_provider.h" +#include "components/omnibox/browser/shortcuts_provider.h" +#include "components/omnibox/browser/zero_suggest_provider.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "grit/components_strings.h" diff --git a/components/omnibox/autocomplete_controller.h b/components/omnibox/browser/autocomplete_controller.h similarity index 95% rename from components/omnibox/autocomplete_controller.h rename to components/omnibox/browser/autocomplete_controller.h index cfd5c87037c4..bcdfc1802a0e 100644 --- a/components/omnibox/autocomplete_controller.h +++ b/components/omnibox/browser/autocomplete_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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_CONTROLLER_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_CONTROLLER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -12,11 +12,11 @@ #include "base/strings/string16.h" #include "base/time/time.h" #include "base/timer/timer.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/autocomplete_result.h" class AutocompleteControllerDelegate; class HistoryURLProvider; @@ -256,4 +256,4 @@ class AutocompleteController : public AutocompleteProviderListener { DISALLOW_COPY_AND_ASSIGN(AutocompleteController); }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_CONTROLLER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_H_ diff --git a/components/omnibox/autocomplete_controller_delegate.h b/components/omnibox/browser/autocomplete_controller_delegate.h similarity index 70% rename from components/omnibox/autocomplete_controller_delegate.h rename to components/omnibox/browser/autocomplete_controller_delegate.h index 45db5357924a..ede97d84c845 100644 --- a/components/omnibox/autocomplete_controller_delegate.h +++ b/components/omnibox/browser/autocomplete_controller_delegate.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_OMNIBOX_AUTOCOMPLETE_CONTROLLER_DELEGATE_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_CONTROLLER_DELEGATE_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_DELEGATE_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_DELEGATE_H_ class AutocompleteControllerDelegate { public: @@ -16,4 +16,4 @@ class AutocompleteControllerDelegate { virtual ~AutocompleteControllerDelegate() {} }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_CONTROLLER_DELEGATE_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_CONTROLLER_DELEGATE_H_ diff --git a/components/omnibox/autocomplete_input.cc b/components/omnibox/browser/autocomplete_input.cc similarity index 99% rename from components/omnibox/autocomplete_input.cc rename to components/omnibox/browser/autocomplete_input.cc index 5ad13c3bebc5..d254b6106bd7 100644 --- a/components/omnibox/autocomplete_input.cc +++ b/components/omnibox/browser/autocomplete_input.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_input.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_scheme_classifier.h" -#include "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/autocomplete_scheme_classifier.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #include "components/url_fixer/url_fixer.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" diff --git a/components/omnibox/autocomplete_input.h b/components/omnibox/browser/autocomplete_input.h similarity index 98% rename from components/omnibox/autocomplete_input.h rename to components/omnibox/browser/autocomplete_input.h index bd3d697da3f6..0d2d35bf8575 100644 --- a/components/omnibox/autocomplete_input.h +++ b/components/omnibox/browser/autocomplete_input.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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_INPUT_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_INPUT_H_ #include @@ -227,4 +227,4 @@ class AutocompleteInput { std::vector terms_prefixed_by_http_or_https_; }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_INPUT_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_INPUT_H_ diff --git a/components/omnibox/autocomplete_input_unittest.cc b/components/omnibox/browser/autocomplete_input_unittest.cc similarity index 99% rename from components/omnibox/autocomplete_input_unittest.cc rename to components/omnibox/browser/autocomplete_input_unittest.cc index 9272829b4cdf..a227f38d83de 100644 --- a/components/omnibox/autocomplete_input_unittest.cc +++ b/components/omnibox/browser/autocomplete_input_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 "components/omnibox/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_input.h" #include "base/basictypes.h" #include "base/strings/string16.h" @@ -10,7 +10,7 @@ #include "build/build_config.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/test_scheme_classifier.h" +#include "components/omnibox/browser/test_scheme_classifier.h" #include "testing/gtest/include/gtest/gtest.h" #include "url/third_party/mozilla/url_parse.h" diff --git a/components/omnibox/autocomplete_match.cc b/components/omnibox/browser/autocomplete_match.cc similarity index 99% rename from components/omnibox/autocomplete_match.cc rename to components/omnibox/browser/autocomplete_match.cc index 51d68a3b1f4c..77bcf256b6f9 100644 --- a/components/omnibox/autocomplete_match.cc +++ b/components/omnibox/browser/autocomplete_match.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 "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" @@ -13,8 +13,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "grit/components_scaled_resources.h" diff --git a/components/omnibox/autocomplete_match.h b/components/omnibox/browser/autocomplete_match.h similarity index 98% rename from components/omnibox/autocomplete_match.h rename to components/omnibox/browser/autocomplete_match.h index 940ee4cccf9d..bcc9d9ab5e05 100644 --- a/components/omnibox/autocomplete_match.h +++ b/components/omnibox/browser/autocomplete_match.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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_ #include #include #include #include "base/memory/scoped_ptr.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match_type.h" #include "components/search_engines/template_url.h" #include "ui/base/page_transition_types.h" #include "url/gurl.h" @@ -421,4 +421,4 @@ typedef AutocompleteMatch::ACMatchClassification ACMatchClassification; typedef std::vector ACMatchClassifications; typedef std::vector ACMatches; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_H_ diff --git a/components/omnibox/autocomplete_match_type.cc b/components/omnibox/browser/autocomplete_match_type.cc similarity index 93% rename from components/omnibox/autocomplete_match_type.cc rename to components/omnibox/browser/autocomplete_match_type.cc index e2ee0ab1778d..b4f260acee44 100644 --- a/components/omnibox/autocomplete_match_type.cc +++ b/components/omnibox/browser/autocomplete_match_type.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 "components/omnibox/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_match_type.h" #include "base/basictypes.h" diff --git a/components/omnibox/autocomplete_match_type.h b/components/omnibox/browser/autocomplete_match_type.h similarity index 93% rename from components/omnibox/autocomplete_match_type.h rename to components/omnibox/browser/autocomplete_match_type.h index fc0e359c1619..fa672cf968b2 100644 --- a/components/omnibox/autocomplete_match_type.h +++ b/components/omnibox/browser/autocomplete_match_type.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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_TYPE_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_TYPE_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_TYPE_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_TYPE_H_ #include @@ -50,4 +50,4 @@ struct AutocompleteMatchType { static std::string ToString(AutocompleteMatchType::Type type); }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_MATCH_TYPE_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_MATCH_TYPE_H_ diff --git a/components/omnibox/autocomplete_match_unittest.cc b/components/omnibox/browser/autocomplete_match_unittest.cc similarity index 98% rename from components/omnibox/autocomplete_match_unittest.cc rename to components/omnibox/browser/autocomplete_match_unittest.cc index 6f37c7cc2bee..73fc1533e3a4 100644 --- a/components/omnibox/autocomplete_match_unittest.cc +++ b/components/omnibox/browser/autocomplete_match_unittest.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "base/basictypes.h" #include "base/strings/utf_string_conversions.h" -#include "components/omnibox/test_scheme_classifier.h" +#include "components/omnibox/browser/test_scheme_classifier.h" #include "testing/gtest/include/gtest/gtest.h" TEST(AutocompleteMatchTest, MoreRelevant) { diff --git a/components/omnibox/autocomplete_provider.cc b/components/omnibox/browser/autocomplete_provider.cc similarity index 97% rename from components/omnibox/autocomplete_provider.cc rename to components/omnibox/browser/autocomplete_provider.cc index 7db750a8121e..7c43ab419511 100644 --- a/components/omnibox/autocomplete_provider.cc +++ b/components/omnibox/browser/autocomplete_provider.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "components/url_fixer/url_fixer.h" #include "net/base/net_util.h" #include "url/gurl.h" diff --git a/components/omnibox/autocomplete_provider.h b/components/omnibox/browser/autocomplete_provider.h similarity index 98% rename from components/omnibox/autocomplete_provider.h rename to components/omnibox/browser/autocomplete_provider.h index 049e3b991f28..2046a32f53a6 100644 --- a/components/omnibox/autocomplete_provider.h +++ b/components/omnibox/browser/autocomplete_provider.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_H_ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "base/strings/string16.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" class AutocompleteInput; @@ -256,4 +256,4 @@ class AutocompleteProvider DISALLOW_COPY_AND_ASSIGN(AutocompleteProvider); }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_H_ diff --git a/components/omnibox/autocomplete_provider_client.h b/components/omnibox/browser/autocomplete_provider_client.h similarity index 93% rename from components/omnibox/autocomplete_provider_client.h rename to components/omnibox/browser/autocomplete_provider_client.h index 0b82524f0550..acaa7acb1ca6 100644 --- a/components/omnibox/autocomplete_provider_client.h +++ b/components/omnibox/browser/autocomplete_provider_client.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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_CLIENT_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_CLIENT_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_CLIENT_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_CLIENT_H_ #include @@ -12,8 +12,8 @@ #include "components/history/core/browser/keyword_id.h" #include "components/history/core/browser/top_sites.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/keyword_extensions_delegate.h" -#include "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/keyword_extensions_delegate.h" +#include "components/omnibox/browser/shortcuts_backend.h" class AutocompleteController; struct AutocompleteMatch; @@ -123,4 +123,4 @@ class AutocompleteProviderClient { virtual void ConfigureKeywordProvider(KeywordProvider* keyword_provider) {} }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_CLIENT_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_CLIENT_H_ diff --git a/components/omnibox/autocomplete_provider_listener.h b/components/omnibox/browser/autocomplete_provider_listener.h similarity index 84% rename from components/omnibox/autocomplete_provider_listener.h rename to components/omnibox/browser/autocomplete_provider_listener.h index 716a5463e6ae..831864722411 100644 --- a/components/omnibox/autocomplete_provider_listener.h +++ b/components/omnibox/browser/autocomplete_provider_listener.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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_LISTENER_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_LISTENER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_LISTENER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_LISTENER_H_ class AutocompleteProviderListener { public: @@ -27,4 +27,4 @@ class AutocompleteProviderListener { virtual ~AutocompleteProviderListener() {} }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_PROVIDER_LISTENER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_PROVIDER_LISTENER_H_ diff --git a/components/omnibox/autocomplete_result.cc b/components/omnibox/browser/autocomplete_result.cc similarity index 97% rename from components/omnibox/autocomplete_result.cc rename to components/omnibox/browser/autocomplete_result.cc index 944ec6f31bc9..da7f1ca380ca 100644 --- a/components/omnibox/autocomplete_result.cc +++ b/components/omnibox/browser/autocomplete_result.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 "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_result.h" #include #include @@ -12,11 +12,11 @@ #include "base/strings/utf_string_conversions.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/omnibox_switches.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_switches.h" #include "components/search/search.h" #include "components/url_fixer/url_fixer.h" diff --git a/components/omnibox/autocomplete_result.h b/components/omnibox/browser/autocomplete_result.h similarity index 96% rename from components/omnibox/autocomplete_result.h rename to components/omnibox/browser/autocomplete_result.h index eedfe531150c..d532de6590f6 100644 --- a/components/omnibox/autocomplete_result.h +++ b/components/omnibox/browser/autocomplete_result.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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_RESULT_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_RESULT_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_RESULT_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_RESULT_H_ #include @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match.h" #include "url/gurl.h" class AutocompleteInput; @@ -182,4 +182,4 @@ class AutocompleteResult { DISALLOW_COPY_AND_ASSIGN(AutocompleteResult); }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_RESULT_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_RESULT_H_ diff --git a/components/omnibox/autocomplete_result_unittest.cc b/components/omnibox/browser/autocomplete_result_unittest.cc similarity index 98% rename from components/omnibox/autocomplete_result_unittest.cc rename to components/omnibox/browser/autocomplete_result_unittest.cc index 230a4bfd9e7d..0e6566940fef 100644 --- a/components/omnibox/autocomplete_result_unittest.cc +++ b/components/omnibox/browser/autocomplete_result_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 "components/omnibox/autocomplete_result.h" +#include "components/omnibox/browser/autocomplete_result.h" #include @@ -12,12 +12,12 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_match_type.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/test_scheme_classifier.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/test_scheme_classifier.h" #include "components/search_engines/template_url_service.h" #include "components/variations/entropy_provider.h" #include "components/variations/variations_associated_data.h" diff --git a/components/omnibox/autocomplete_scheme_classifier.h b/components/omnibox/browser/autocomplete_scheme_classifier.h similarity index 84% rename from components/omnibox/autocomplete_scheme_classifier.h rename to components/omnibox/browser/autocomplete_scheme_classifier.h index b94b90b665a6..42e5d0b8d2dd 100644 --- a/components/omnibox/autocomplete_scheme_classifier.h +++ b/components/omnibox/browser/autocomplete_scheme_classifier.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 COMPONENTS_OMNIBOX_AUTOCOMPLETE_SCHEME_CLASSIFIER_H_ -#define COMPONENTS_OMNIBOX_AUTOCOMPLETE_SCHEME_CLASSIFIER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_SCHEME_CLASSIFIER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_SCHEME_CLASSIFIER_H_ #include @@ -27,4 +27,4 @@ class AutocompleteSchemeClassifier { const std::string& scheme) const = 0; }; -#endif // COMPONENTS_OMNIBOX_AUTOCOMPLETE_SCHEME_CLASSIFIER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_AUTOCOMPLETE_SCHEME_CLASSIFIER_H_ diff --git a/components/omnibox/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc similarity index 98% rename from components/omnibox/base_search_provider.cc rename to components/omnibox/browser/base_search_provider.cc index 02e17995613b..028c322b89ae 100644 --- a/components/omnibox/base_search_provider.cc +++ b/components/omnibox/browser/base_search_provider.cc @@ -2,17 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/base_search_provider.h" +#include "components/omnibox/browser/base_search_provider.h" #include "base/i18n/case_conversion.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/search_engines/template_url_service.h" diff --git a/components/omnibox/base_search_provider.h b/components/omnibox/browser/base_search_provider.h similarity index 96% rename from components/omnibox/base_search_provider.h rename to components/omnibox/browser/base_search_provider.h index edddc57a6b80..dcf1218a70df 100644 --- a/components/omnibox/base_search_provider.h +++ b/components/omnibox/browser/base_search_provider.h @@ -6,8 +6,8 @@ // providers. Search provider and zero suggest provider both use it for common // functionality. -#ifndef COMPONENTS_OMNIBOX_BASE_SEARCH_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_BASE_SEARCH_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_BASE_SEARCH_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_BASE_SEARCH_PROVIDER_H_ #include #include @@ -17,10 +17,10 @@ #include "base/memory/scoped_vector.h" #include "base/strings/string16.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/search_suggestion_parser.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/search_suggestion_parser.h" class AutocompleteProviderClient; class GURL; @@ -263,4 +263,4 @@ class BaseSearchProvider : public AutocompleteProvider { DISALLOW_COPY_AND_ASSIGN(BaseSearchProvider); }; -#endif // COMPONENTS_OMNIBOX_BASE_SEARCH_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_BASE_SEARCH_PROVIDER_H_ diff --git a/components/omnibox/base_search_provider_unittest.cc b/components/omnibox/browser/base_search_provider_unittest.cc similarity index 93% rename from components/omnibox/base_search_provider_unittest.cc rename to components/omnibox/browser/base_search_provider_unittest.cc index ef8da84853f8..0800f03b47a9 100644 --- a/components/omnibox/base_search_provider_unittest.cc +++ b/components/omnibox/browser/base_search_provider_unittest.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/base_search_provider.h" +#include "components/omnibox/browser/base_search_provider.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_match_type.h" -#include "components/omnibox/autocomplete_scheme_classifier.h" -#include "components/omnibox/mock_autocomplete_provider_client.h" -#include "components/omnibox/search_suggestion_parser.h" -#include "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_scheme_classifier.h" +#include "components/omnibox/browser/mock_autocomplete_provider_client.h" +#include "components/omnibox/browser/search_suggestion_parser.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url_service.h" #include "components/search_engines/template_url_service_client.h" diff --git a/components/omnibox/bookmark_provider.cc b/components/omnibox/browser/bookmark_provider.cc similarity index 98% rename from components/omnibox/bookmark_provider.cc rename to components/omnibox/browser/bookmark_provider.cc index 3eea212146f4..ffce9b8f9234 100644 --- a/components/omnibox/bookmark_provider.cc +++ b/components/omnibox/browser/bookmark_provider.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 "components/omnibox/bookmark_provider.h" +#include "components/omnibox/browser/bookmark_provider.h" #include #include @@ -14,10 +14,10 @@ #include "components/bookmarks/browser/bookmark_match.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/history_provider.h" -#include "components/omnibox/url_prefix.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/history_provider.h" +#include "components/omnibox/browser/url_prefix.h" #include "net/base/net_util.h" #include "url/url_constants.h" diff --git a/components/omnibox/bookmark_provider.h b/components/omnibox/browser/bookmark_provider.h similarity index 89% rename from components/omnibox/bookmark_provider.h rename to components/omnibox/browser/bookmark_provider.h index 79edcd6b92f8..2b429f398257 100644 --- a/components/omnibox/bookmark_provider.h +++ b/components/omnibox/browser/bookmark_provider.h @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_OMNIBOX_BOOKMARK_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_BOOKMARK_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_BOOKMARK_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_BOOKMARK_PROVIDER_H_ #include -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "components/query_parser/snippet.h" class AutocompleteProviderClient; @@ -79,4 +79,4 @@ class BookmarkProvider : public AutocompleteProvider { DISALLOW_COPY_AND_ASSIGN(BookmarkProvider); }; -#endif // COMPONENTS_OMNIBOX_BOOKMARK_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_BOOKMARK_PROVIDER_H_ diff --git a/components/omnibox/builtin_provider.cc b/components/omnibox/browser/builtin_provider.cc similarity index 96% rename from components/omnibox/builtin_provider.cc rename to components/omnibox/browser/builtin_provider.cc index a364847a1c4c..43e728b8eba0 100644 --- a/components/omnibox/builtin_provider.cc +++ b/components/omnibox/browser/builtin_provider.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/builtin_provider.h" +#include "components/omnibox/browser/builtin_provider.h" #include #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/history_provider.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/history_provider.h" #include "components/url_fixer/url_fixer.h" const int BuiltinProvider::kRelevance = 860; diff --git a/components/omnibox/builtin_provider.h b/components/omnibox/browser/builtin_provider.h similarity index 78% rename from components/omnibox/builtin_provider.h rename to components/omnibox/browser/builtin_provider.h index 65b1a3c5a624..4c6a9d5c6197 100644 --- a/components/omnibox/builtin_provider.h +++ b/components/omnibox/browser/builtin_provider.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 COMPONENTS_OMNIBOX_BUILTIN_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_BUILTIN_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_BUILTIN_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_BUILTIN_PROVIDER_H_ #include #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/strings/string16.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider.h" class AutocompleteProviderClient; @@ -41,4 +41,4 @@ class BuiltinProvider : public AutocompleteProvider { DISALLOW_COPY_AND_ASSIGN(BuiltinProvider); }; -#endif // COMPONENTS_OMNIBOX_BUILTIN_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_BUILTIN_PROVIDER_H_ diff --git a/components/omnibox/history_provider.cc b/components/omnibox/browser/history_provider.cc similarity index 93% rename from components/omnibox/history_provider.cc rename to components/omnibox/browser/history_provider.cc index f78ccb3ddf54..004d542b22a5 100644 --- a/components/omnibox/history_provider.cc +++ b/components/omnibox/browser/history_provider.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 "components/omnibox/history_provider.h" +#include "components/omnibox/browser/history_provider.h" #include @@ -10,9 +10,9 @@ #include "base/strings/utf_string_conversions.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/history/core/browser/history_service.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/in_memory_url_index_types.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" #include "url/url_util.h" using bookmarks::BookmarkModel; diff --git a/components/omnibox/history_provider.h b/components/omnibox/browser/history_provider.h similarity index 81% rename from components/omnibox/history_provider.h rename to components/omnibox/browser/history_provider.h index e7ed8d2e2f40..a64b0a6f7e7c 100644 --- a/components/omnibox/history_provider.h +++ b/components/omnibox/browser/history_provider.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_OMNIBOX_HISTORY_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_HISTORY_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_HISTORY_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_HISTORY_PROVIDER_H_ #include "base/compiler_specific.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/in_memory_url_index_types.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" class AutocompleteInput; class Profile; @@ -49,4 +49,4 @@ class HistoryProvider : public AutocompleteProvider { DISALLOW_COPY_AND_ASSIGN(HistoryProvider); }; -#endif // COMPONENTS_OMNIBOX_HISTORY_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_HISTORY_PROVIDER_H_ diff --git a/components/omnibox/history_quick_provider.cc b/components/omnibox/browser/history_quick_provider.cc similarity index 96% rename from components/omnibox/history_quick_provider.cc rename to components/omnibox/browser/history_quick_provider.cc index bf18b401479b..d2f15cf8b46f 100644 --- a/components/omnibox/history_quick_provider.cc +++ b/components/omnibox/browser/history_quick_provider.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 "components/omnibox/history_quick_provider.h" +#include "components/omnibox/browser/history_quick_provider.h" #include @@ -19,13 +19,13 @@ #include "components/history/core/browser/history_database.h" #include "components/history/core/browser/history_service.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_match_type.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/history_url_provider.h" -#include "components/omnibox/in_memory_url_index.h" -#include "components/omnibox/in_memory_url_index_types.h" -#include "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/history_url_provider.h" +#include "components/omnibox/browser/in_memory_url_index.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "net/base/escape.h" diff --git a/components/omnibox/history_quick_provider.h b/components/omnibox/browser/history_quick_provider.h similarity index 83% rename from components/omnibox/history_quick_provider.h rename to components/omnibox/browser/history_quick_provider.h index c0a8077a670c..d35ecd3da4db 100644 --- a/components/omnibox/history_quick_provider.h +++ b/components/omnibox/browser/history_quick_provider.h @@ -2,18 +2,18 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_OMNIBOX_HISTORY_QUICK_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_HISTORY_QUICK_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_HISTORY_QUICK_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_HISTORY_QUICK_PROVIDER_H_ #include #include "base/basictypes.h" #include "base/compiler_specific.h" #include "components/history/core/browser/history_types.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/history_provider.h" -#include "components/omnibox/in_memory_url_index.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/history_provider.h" +#include "components/omnibox/browser/in_memory_url_index.h" struct ScoredHistoryMatch; @@ -61,4 +61,4 @@ class HistoryQuickProvider : public HistoryProvider { DISALLOW_COPY_AND_ASSIGN(HistoryQuickProvider); }; -#endif // COMPONENTS_OMNIBOX_HISTORY_QUICK_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_HISTORY_QUICK_PROVIDER_H_ diff --git a/components/omnibox/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc similarity index 99% rename from components/omnibox/history_url_provider.cc rename to components/omnibox/browser/history_url_provider.cc index faa4b2fb0a74..7d017352aa13 100644 --- a/components/omnibox/history_url_provider.cc +++ b/components/omnibox/browser/history_url_provider.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 "components/omnibox/history_url_provider.h" +#include "components/omnibox/browser/history_url_provider.h" #include @@ -23,13 +23,13 @@ #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/history_types.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/in_memory_url_index_types.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/scored_history_match.h" -#include "components/omnibox/url_prefix.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/scored_history_match.h" +#include "components/omnibox/browser/url_prefix.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url_service.h" #include "components/url_fixer/url_fixer.h" diff --git a/components/omnibox/history_url_provider.h b/components/omnibox/browser/history_url_provider.h similarity index 97% rename from components/omnibox/history_url_provider.h rename to components/omnibox/browser/history_url_provider.h index 8bca263f53df..ec7dc81f9bd6 100644 --- a/components/omnibox/history_url_provider.h +++ b/components/omnibox/browser/history_url_provider.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 COMPONENTS_OMNIBOX_HISTORY_URL_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_HISTORY_URL_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_HISTORY_URL_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_HISTORY_URL_PROVIDER_H_ #include #include @@ -12,9 +12,9 @@ #include "base/synchronization/cancellation_flag.h" #include "base/threading/thread_checker.h" #include "components/history/core/browser/history_match.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/history_provider.h" -#include "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/history_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #include "components/search_engines/template_url.h" class AutocompleteProviderListener; @@ -340,4 +340,4 @@ class HistoryURLProvider : public HistoryProvider { DISALLOW_COPY_AND_ASSIGN(HistoryURLProvider); }; -#endif // COMPONENTS_OMNIBOX_HISTORY_URL_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_HISTORY_URL_PROVIDER_H_ diff --git a/components/omnibox/in_memory_url_index.cc b/components/omnibox/browser/in_memory_url_index.cc similarity index 99% rename from components/omnibox/in_memory_url_index.cc rename to components/omnibox/browser/in_memory_url_index.cc index cdcb7a32ec56..992001303b16 100644 --- a/components/omnibox/in_memory_url_index.cc +++ b/components/omnibox/browser/in_memory_url_index.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/omnibox/in_memory_url_index.h" +#include "components/omnibox/browser/in_memory_url_index.h" #include "base/files/file_util.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" #include "components/history/core/browser/history_service.h" #include "components/history/core/browser/url_database.h" -#include "components/omnibox/url_index_private_data.h" +#include "components/omnibox/browser/url_index_private_data.h" using in_memory_url_index::InMemoryURLIndexCacheItem; diff --git a/components/omnibox/in_memory_url_index.h b/components/omnibox/browser/in_memory_url_index.h similarity index 98% rename from components/omnibox/in_memory_url_index.h rename to components/omnibox/browser/in_memory_url_index.h index 58bf21081a8a..868d88ba66b0 100644 --- a/components/omnibox/in_memory_url_index.h +++ b/components/omnibox/browser/in_memory_url_index.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 COMPONENTS_OMNIBOX_IN_MEMORY_URL_INDEX_H_ -#define COMPONENTS_OMNIBOX_IN_MEMORY_URL_INDEX_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_H_ +#define COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_H_ #include #include @@ -24,7 +24,7 @@ #include "components/history/core/browser/history_service_observer.h" #include "components/history/core/browser/history_types.h" #include "components/keyed_service/core/keyed_service.h" -#include "components/omnibox/scored_history_match.h" +#include "components/omnibox/browser/scored_history_match.h" class HistoryQuickProviderTest; @@ -322,4 +322,4 @@ class InMemoryURLIndex : public KeyedService, DISALLOW_COPY_AND_ASSIGN(InMemoryURLIndex); }; -#endif // COMPONENTS_OMNIBOX_IN_MEMORY_URL_INDEX_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_H_ diff --git a/components/omnibox/in_memory_url_index_cache.proto b/components/omnibox/browser/in_memory_url_index_cache.proto similarity index 100% rename from components/omnibox/in_memory_url_index_cache.proto rename to components/omnibox/browser/in_memory_url_index_cache.proto diff --git a/components/omnibox/in_memory_url_index_types.cc b/components/omnibox/browser/in_memory_url_index_types.cc similarity index 98% rename from components/omnibox/in_memory_url_index_types.cc rename to components/omnibox/browser/in_memory_url_index_types.cc index a2e000f566a4..1a658a43513d 100644 --- a/components/omnibox/in_memory_url_index_types.cc +++ b/components/omnibox/browser/in_memory_url_index_types.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 "components/omnibox/in_memory_url_index_types.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" #include #include diff --git a/components/omnibox/in_memory_url_index_types.h b/components/omnibox/browser/in_memory_url_index_types.h similarity index 97% rename from components/omnibox/in_memory_url_index_types.h rename to components/omnibox/browser/in_memory_url_index_types.h index f9e16eec9dce..089559c44557 100644 --- a/components/omnibox/in_memory_url_index_types.h +++ b/components/omnibox/browser/in_memory_url_index_types.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 COMPONENTS_OMNIBOX_IN_MEMORY_URL_INDEX_TYPES_H_ -#define COMPONENTS_OMNIBOX_IN_MEMORY_URL_INDEX_TYPES_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_TYPES_H_ +#define COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_TYPES_H_ #include #include @@ -168,4 +168,4 @@ struct RowWordStarts { }; typedef std::map WordStartsMap; -#endif // COMPONENTS_OMNIBOX_IN_MEMORY_URL_INDEX_TYPES_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_IN_MEMORY_URL_INDEX_TYPES_H_ diff --git a/components/omnibox/in_memory_url_index_types_unittest.cc b/components/omnibox/browser/in_memory_url_index_types_unittest.cc similarity index 98% rename from components/omnibox/in_memory_url_index_types_unittest.cc rename to components/omnibox/browser/in_memory_url_index_types_unittest.cc index 1bc4301f3b91..9229d437a831 100644 --- a/components/omnibox/in_memory_url_index_types_unittest.cc +++ b/components/omnibox/browser/in_memory_url_index_types_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 "components/omnibox/in_memory_url_index_types.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" #include diff --git a/components/omnibox/keyword_extensions_delegate.cc b/components/omnibox/browser/keyword_extensions_delegate.cc similarity index 93% rename from components/omnibox/keyword_extensions_delegate.cc rename to components/omnibox/browser/keyword_extensions_delegate.cc index 6cbac9d3f717..78849135a53b 100644 --- a/components/omnibox/keyword_extensions_delegate.cc +++ b/components/omnibox/browser/keyword_extensions_delegate.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 "components/omnibox/keyword_extensions_delegate.h" +#include "components/omnibox/browser/keyword_extensions_delegate.h" KeywordExtensionsDelegate::KeywordExtensionsDelegate( KeywordProvider* provider) { diff --git a/components/omnibox/keyword_extensions_delegate.h b/components/omnibox/browser/keyword_extensions_delegate.h similarity index 90% rename from components/omnibox/keyword_extensions_delegate.h rename to components/omnibox/browser/keyword_extensions_delegate.h index 08cacafb2e84..1b67b985f8a7 100644 --- a/components/omnibox/keyword_extensions_delegate.h +++ b/components/omnibox/browser/keyword_extensions_delegate.h @@ -7,8 +7,8 @@ // This file contains the dummy implementation of KeywordExtensionsDelegate, // which does nothing. -#ifndef COMPONENTS_OMNIBOX_KEYWORD_EXTENSIONS_DELEGATE_H_ -#define COMPONENTS_OMNIBOX_KEYWORD_EXTENSIONS_DELEGATE_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_KEYWORD_EXTENSIONS_DELEGATE_H_ +#define COMPONENTS_OMNIBOX_BROWSER_KEYWORD_EXTENSIONS_DELEGATE_H_ #include @@ -56,4 +56,4 @@ class KeywordExtensionsDelegate { DISALLOW_COPY_AND_ASSIGN(KeywordExtensionsDelegate); }; -#endif // COMPONENTS_OMNIBOX_KEYWORD_EXTENSIONS_DELEGATE_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_KEYWORD_EXTENSIONS_DELEGATE_H_ diff --git a/components/omnibox/keyword_provider.cc b/components/omnibox/browser/keyword_provider.cc similarity index 98% rename from components/omnibox/keyword_provider.cc rename to components/omnibox/browser/keyword_provider.cc index c7d8a81c3185..b6f7877b3e30 100644 --- a/components/omnibox/keyword_provider.cc +++ b/components/omnibox/browser/keyword_provider.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 "components/omnibox/keyword_provider.h" +#include "components/omnibox/browser/keyword_provider.h" #include #include @@ -11,10 +11,10 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/keyword_extensions_delegate.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/keyword_extensions_delegate.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "grit/components_strings.h" diff --git a/components/omnibox/keyword_provider.h b/components/omnibox/browser/keyword_provider.h similarity index 95% rename from components/omnibox/keyword_provider.h rename to components/omnibox/browser/keyword_provider.h index 63dfa47f29d4..3be6313b9287 100644 --- a/components/omnibox/keyword_provider.h +++ b/components/omnibox/browser/keyword_provider.h @@ -8,8 +8,8 @@ // instance of it gets created and managed by the autocomplete controller. // KeywordProvider uses a TemplateURLService to find the set of keywords. -#ifndef COMPONENTS_OMNIBOX_KEYWORD_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_KEYWORD_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_KEYWORD_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_KEYWORD_PROVIDER_H_ #include @@ -17,9 +17,9 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/keyword_extensions_delegate.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/keyword_extensions_delegate.h" class AutocompleteProviderClient; class AutocompleteProviderListener; @@ -151,4 +151,4 @@ class KeywordProvider : public AutocompleteProvider { DISALLOW_COPY_AND_ASSIGN(KeywordProvider); }; -#endif // COMPONENTS_OMNIBOX_KEYWORD_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_KEYWORD_PROVIDER_H_ diff --git a/components/omnibox/keyword_provider_unittest.cc b/components/omnibox/browser/keyword_provider_unittest.cc similarity index 98% rename from components/omnibox/keyword_provider_unittest.cc rename to components/omnibox/browser/keyword_provider_unittest.cc index 720811f7b739..15be17c5114a 100644 --- a/components/omnibox/keyword_provider_unittest.cc +++ b/components/omnibox/browser/keyword_provider_unittest.cc @@ -6,10 +6,10 @@ #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_scheme_classifier.h" -#include "components/omnibox/keyword_provider.h" -#include "components/omnibox/mock_autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_scheme_classifier.h" +#include "components/omnibox/browser/keyword_provider.h" +#include "components/omnibox/browser/mock_autocomplete_provider_client.h" #include "components/search_engines/search_engines_switches.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" diff --git a/components/omnibox/mock_autocomplete_provider_client.cc b/components/omnibox/browser/mock_autocomplete_provider_client.cc similarity index 80% rename from components/omnibox/mock_autocomplete_provider_client.cc rename to components/omnibox/browser/mock_autocomplete_provider_client.cc index f1a0d273222b..c7f0cd6966a8 100644 --- a/components/omnibox/mock_autocomplete_provider_client.cc +++ b/components/omnibox/browser/mock_autocomplete_provider_client.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 "components/omnibox/mock_autocomplete_provider_client.h" +#include "components/omnibox/browser/mock_autocomplete_provider_client.h" MockAutocompleteProviderClient::MockAutocompleteProviderClient() { } diff --git a/components/omnibox/mock_autocomplete_provider_client.h b/components/omnibox/browser/mock_autocomplete_provider_client.h similarity index 91% rename from components/omnibox/mock_autocomplete_provider_client.h rename to components/omnibox/browser/mock_autocomplete_provider_client.h index 4f133dfdd9b3..fc73c1f64107 100644 --- a/components/omnibox/mock_autocomplete_provider_client.h +++ b/components/omnibox/browser/mock_autocomplete_provider_client.h @@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_OMNIBOX_MOCK_AUTOCOMPLETE_PROVIDER_CLIENT_H_ -#define COMPONENTS_OMNIBOX_MOCK_AUTOCOMPLETE_PROVIDER_CLIENT_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_MOCK_AUTOCOMPLETE_PROVIDER_CLIENT_H_ +#define COMPONENTS_OMNIBOX_BROWSER_MOCK_AUTOCOMPLETE_PROVIDER_CLIENT_H_ #include -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/autocomplete_scheme_classifier.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_scheme_classifier.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url_service.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/components/omnibox/omnibox_field_trial.cc b/components/omnibox/browser/omnibox_field_trial.cc similarity index 99% rename from components/omnibox/omnibox_field_trial.cc rename to components/omnibox/browser/omnibox_field_trial.cc index 669c213b8d26..1ef2efedda34 100644 --- a/components/omnibox/omnibox_field_trial.cc +++ b/components/omnibox/browser/omnibox_field_trial.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 "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #include #include @@ -15,7 +15,7 @@ #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/omnibox_switches.h" +#include "components/omnibox/browser/omnibox_switches.h" #include "components/search/search.h" #include "components/variations/active_field_trials.h" #include "components/variations/metrics_util.h" diff --git a/components/omnibox/omnibox_field_trial.h b/components/omnibox/browser/omnibox_field_trial.h similarity index 98% rename from components/omnibox/omnibox_field_trial.h rename to components/omnibox/browser/omnibox_field_trial.h index 9a8cad70a152..3bf517983500 100644 --- a/components/omnibox/omnibox_field_trial.h +++ b/components/omnibox/browser/omnibox_field_trial.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 COMPONENTS_OMNIBOX_OMNIBOX_FIELD_TRIAL_H_ -#define COMPONENTS_OMNIBOX_OMNIBOX_FIELD_TRIAL_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_FIELD_TRIAL_H_ +#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_FIELD_TRIAL_H_ #include #include @@ -12,7 +12,7 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_match_type.h" namespace base { class TimeDelta; @@ -387,4 +387,4 @@ class OmniboxFieldTrial { DISALLOW_IMPLICIT_CONSTRUCTORS(OmniboxFieldTrial); }; -#endif // COMPONENTS_OMNIBOX_OMNIBOX_FIELD_TRIAL_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_FIELD_TRIAL_H_ diff --git a/components/omnibox/omnibox_field_trial_unittest.cc b/components/omnibox/browser/omnibox_field_trial_unittest.cc similarity index 99% rename from components/omnibox/omnibox_field_trial_unittest.cc rename to components/omnibox/browser/omnibox_field_trial_unittest.cc index fe302714d761..38e2252517cb 100644 --- a/components/omnibox/omnibox_field_trial_unittest.cc +++ b/components/omnibox/browser/omnibox_field_trial_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 "components/omnibox/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_field_trial.h" #include "base/basictypes.h" #include "base/command_line.h" diff --git a/components/omnibox/omnibox_log.cc b/components/omnibox/browser/omnibox_log.cc similarity index 96% rename from components/omnibox/omnibox_log.cc rename to components/omnibox/browser/omnibox_log.cc index 51924b820194..7f6b8204176b 100644 --- a/components/omnibox/omnibox_log.cc +++ b/components/omnibox/browser/omnibox_log.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 "components/omnibox/omnibox_log.h" +#include "components/omnibox/browser/omnibox_log.h" OmniboxLog::OmniboxLog( const base::string16& text, diff --git a/components/omnibox/omnibox_log.h b/components/omnibox/browser/omnibox_log.h similarity index 94% rename from components/omnibox/omnibox_log.h rename to components/omnibox/browser/omnibox_log.h index 4cb584b139ce..7a64244ce4e6 100644 --- a/components/omnibox/omnibox_log.h +++ b/components/omnibox/browser/omnibox_log.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 COMPONENTS_OMNIBOX_OMNIBOX_LOG_H_ -#define COMPONENTS_OMNIBOX_OMNIBOX_LOG_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_LOG_H_ +#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_LOG_H_ #include @@ -11,7 +11,7 @@ #include "base/time/time.h" #include "components/metrics/proto/omnibox_event.pb.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider.h" #include "components/sessions/session_id.h" class AutocompleteResult; @@ -97,4 +97,4 @@ struct OmniboxLog { ProvidersInfo providers_info; }; -#endif // COMPONENTS_OMNIBOX_OMNIBOX_LOG_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_LOG_H_ diff --git a/components/omnibox/omnibox_popup_model_observer.h b/components/omnibox/browser/omnibox_popup_model_observer.h similarity index 70% rename from components/omnibox/omnibox_popup_model_observer.h rename to components/omnibox/browser/omnibox_popup_model_observer.h index f08aca7d1c34..1a2e8edc0fd7 100644 --- a/components/omnibox/omnibox_popup_model_observer.h +++ b/components/omnibox/browser/omnibox_popup_model_observer.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 COMPONENTS_OMNIBOX_OMNIBOX_POPUP_MODEL_OBSERVER_H_ -#define COMPONENTS_OMNIBOX_OMNIBOX_POPUP_MODEL_OBSERVER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_OBSERVER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_OBSERVER_H_ // Allows observers to react and update accordingly when state of // |OmniboxPopupModel| changes, e.g. when the omnibox popup is shown or hidden. @@ -13,4 +13,4 @@ class OmniboxPopupModelObserver { virtual void OnOmniboxPopupShownOrHidden() = 0; }; -#endif // COMPONENTS_OMNIBOX_OMNIBOX_POPUP_MODEL_OBSERVER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_OBSERVER_H_ diff --git a/components/omnibox/omnibox_popup_view.h b/components/omnibox/browser/omnibox_popup_view.h similarity index 90% rename from components/omnibox/omnibox_popup_view.h rename to components/omnibox/browser/omnibox_popup_view.h index d50b3e519352..57823da30489 100644 --- a/components/omnibox/omnibox_popup_view.h +++ b/components/omnibox/browser/omnibox_popup_view.h @@ -8,8 +8,8 @@ // communication with the view. Since the model is shared between platforms, // we need to define an interface that all view implementations will share. -#ifndef COMPONENTS_OMNIBOX_OMNIBOX_POPUP_VIEW_H_ -#define COMPONENTS_OMNIBOX_OMNIBOX_POPUP_VIEW_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_VIEW_H_ +#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_VIEW_H_ #include "build/build_config.h" @@ -46,4 +46,4 @@ class OmniboxPopupView { virtual void OnDragCanceled() = 0; }; -#endif // COMPONENTS_OMNIBOX_OMNIBOX_POPUP_VIEW_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_VIEW_H_ diff --git a/components/omnibox/omnibox_pref_names.cc b/components/omnibox/browser/omnibox_pref_names.cc similarity index 85% rename from components/omnibox/omnibox_pref_names.cc rename to components/omnibox/browser/omnibox_pref_names.cc index ea180807d08f..3d3a54959de7 100644 --- a/components/omnibox/omnibox_pref_names.cc +++ b/components/omnibox/browser/omnibox_pref_names.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 "components/omnibox/omnibox_pref_names.h" +#include "components/omnibox/browser/omnibox_pref_names.h" namespace omnibox { diff --git a/components/omnibox/omnibox_pref_names.h b/components/omnibox/browser/omnibox_pref_names.h similarity index 69% rename from components/omnibox/omnibox_pref_names.h rename to components/omnibox/browser/omnibox_pref_names.h index b24a4c911732..46339d5a473c 100644 --- a/components/omnibox/omnibox_pref_names.h +++ b/components/omnibox/browser/omnibox_pref_names.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 COMPONENTS_OMNIBOX_OMNIBOX_PREF_NAMES_H_ -#define COMPONENTS_OMNIBOX_OMNIBOX_PREF_NAMES_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_PREF_NAMES_H_ +#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_PREF_NAMES_H_ namespace omnibox { @@ -14,4 +14,4 @@ extern const char kZeroSuggestCachedResults[]; } // namespace metrics -#endif // COMPONENTS_OMNIBOX_OMNIBOX_PREF_NAMES_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_PREF_NAMES_H_ diff --git a/components/omnibox/omnibox_switches.cc b/components/omnibox/browser/omnibox_switches.cc similarity index 92% rename from components/omnibox/omnibox_switches.cc rename to components/omnibox/browser/omnibox_switches.cc index 64607b5856c7..ced6133a113b 100644 --- a/components/omnibox/omnibox_switches.cc +++ b/components/omnibox/browser/omnibox_switches.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 "components/omnibox/omnibox_switches.h" +#include "components/omnibox/browser/omnibox_switches.h" namespace switches { diff --git a/components/omnibox/omnibox_switches.h b/components/omnibox/browser/omnibox_switches.h similarity index 68% rename from components/omnibox/omnibox_switches.h rename to components/omnibox/browser/omnibox_switches.h index c259ff2eeb52..012346066187 100644 --- a/components/omnibox/omnibox_switches.h +++ b/components/omnibox/browser/omnibox_switches.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 COMPONENTS_OMNIBOX_OMNIBOX_SWITCHES_H_ -#define COMPONENTS_OMNIBOX_OMNIBOX_SWITCHES_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_SWITCHES_H_ +#define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_SWITCHES_H_ namespace switches { @@ -13,4 +13,4 @@ extern const char kEmphasizeTitlesInOmniboxDropdown[]; } // namespace switches -#endif // COMPONENTS_OMNIBOX_OMNIBOX_SWITCHES_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_SWITCHES_H_ diff --git a/components/omnibox/scored_history_match.cc b/components/omnibox/browser/scored_history_match.cc similarity index 99% rename from components/omnibox/scored_history_match.cc rename to components/omnibox/browser/scored_history_match.cc index 5f05d342b7c9..0c058d6af977 100644 --- a/components/omnibox/scored_history_match.cc +++ b/components/omnibox/browser/scored_history_match.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 "components/omnibox/scored_history_match.h" +#include "components/omnibox/browser/scored_history_match.h" #include @@ -17,9 +17,9 @@ #include "base/strings/utf_offset_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "components/bookmarks/browser/bookmark_utils.h" -#include "components/omnibox/history_url_provider.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/url_prefix.h" +#include "components/omnibox/browser/history_url_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/url_prefix.h" namespace { diff --git a/components/omnibox/scored_history_match.h b/components/omnibox/browser/scored_history_match.h similarity index 97% rename from components/omnibox/scored_history_match.h rename to components/omnibox/browser/scored_history_match.h index 055e635d8263..a4da02eb1dfb 100644 --- a/components/omnibox/scored_history_match.h +++ b/components/omnibox/browser/scored_history_match.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 COMPONENTS_OMNIBOX_SCORED_HISTORY_MATCH_H_ -#define COMPONENTS_OMNIBOX_SCORED_HISTORY_MATCH_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_SCORED_HISTORY_MATCH_H_ +#define COMPONENTS_OMNIBOX_BROWSER_SCORED_HISTORY_MATCH_H_ #include #include @@ -12,7 +12,7 @@ #include "base/time/time.h" #include "components/history/core/browser/history_match.h" #include "components/history/core/browser/history_types.h" -#include "components/omnibox/in_memory_url_index_types.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" #include "testing/gtest/include/gtest/gtest_prod.h" class ScoredHistoryMatchTest; @@ -193,4 +193,4 @@ struct ScoredHistoryMatch : public history::HistoryMatch { }; typedef std::vector ScoredHistoryMatches; -#endif // COMPONENTS_OMNIBOX_SCORED_HISTORY_MATCH_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_SCORED_HISTORY_MATCH_H_ diff --git a/components/omnibox/scored_history_match_unittest.cc b/components/omnibox/browser/scored_history_match_unittest.cc similarity index 99% rename from components/omnibox/scored_history_match_unittest.cc rename to components/omnibox/browser/scored_history_match_unittest.cc index 5714bcc896eb..b6ff8ab108ea 100644 --- a/components/omnibox/scored_history_match_unittest.cc +++ b/components/omnibox/browser/scored_history_match_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 "components/omnibox/scored_history_match.h" +#include "components/omnibox/browser/scored_history_match.h" #include diff --git a/components/omnibox/search_provider.cc b/components/omnibox/browser/search_provider.cc similarity index 99% rename from components/omnibox/search_provider.cc rename to components/omnibox/browser/search_provider.cc index d70513a6b967..05f9cc5ffaab 100644 --- a/components/omnibox/search_provider.cc +++ b/components/omnibox/browser/search_provider.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 "components/omnibox/search_provider.h" +#include "components/omnibox/browser/search_provider.h" #include #include @@ -21,13 +21,13 @@ #include "components/history/core/browser/in_memory_database.h" #include "components/history/core/browser/keyword_search_term.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/keyword_provider.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/suggestion_answer.h" -#include "components/omnibox/url_prefix.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/keyword_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/suggestion_answer.h" +#include "components/omnibox/browser/url_prefix.h" #include "components/search/search.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/search_engines/template_url_service.h" diff --git a/components/omnibox/search_provider.h b/components/omnibox/browser/search_provider.h similarity index 98% rename from components/omnibox/search_provider.h rename to components/omnibox/browser/search_provider.h index fc5b900535b7..51f5e6c816b3 100644 --- a/components/omnibox/search_provider.h +++ b/components/omnibox/browser/search_provider.h @@ -8,8 +8,8 @@ // history, and search suggestions. An instance of it gets created and // managed by the autocomplete controller. -#ifndef COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_SEARCH_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_SEARCH_PROVIDER_H_ #include #include @@ -20,8 +20,8 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/answers_cache.h" -#include "components/omnibox/base_search_provider.h" +#include "components/omnibox/browser/answers_cache.h" +#include "components/omnibox/browser/base_search_provider.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service_observer.h" #include "net/url_request/url_fetcher_delegate.h" @@ -409,4 +409,4 @@ class SearchProvider : public BaseSearchProvider, DISALLOW_COPY_AND_ASSIGN(SearchProvider); }; -#endif // COMPONENTS_OMNIBOX_SEARCH_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_SEARCH_PROVIDER_H_ diff --git a/components/omnibox/search_suggestion_parser.cc b/components/omnibox/browser/search_suggestion_parser.cc similarity index 99% rename from components/omnibox/search_suggestion_parser.cc rename to components/omnibox/browser/search_suggestion_parser.cc index 1e04d5fda214..9c411fcaf215 100644 --- a/components/omnibox/search_suggestion_parser.cc +++ b/components/omnibox/browser/search_suggestion_parser.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 "components/omnibox/search_suggestion_parser.h" +#include "components/omnibox/browser/search_suggestion_parser.h" #include @@ -15,8 +15,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/url_prefix.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/url_prefix.h" #include "components/url_fixer/url_fixer.h" #include "net/base/net_util.h" #include "net/http/http_response_headers.h" diff --git a/components/omnibox/search_suggestion_parser.h b/components/omnibox/browser/search_suggestion_parser.h similarity index 96% rename from components/omnibox/search_suggestion_parser.h rename to components/omnibox/browser/search_suggestion_parser.h index e86affb486a8..3ecb78ecd538 100644 --- a/components/omnibox/search_suggestion_parser.h +++ b/components/omnibox/browser/search_suggestion_parser.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 COMPONENTS_OMNIBOX_SEARCH_SUGGESTION_PARSER_H_ -#define COMPONENTS_OMNIBOX_SEARCH_SUGGESTION_PARSER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_SEARCH_SUGGESTION_PARSER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_SEARCH_SUGGESTION_PARSER_H_ #include #include @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "base/strings/string16.h" #include "base/strings/string_piece.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_match_type.h" -#include "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match_type.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "url/gurl.h" class AutocompleteInput; @@ -307,4 +307,4 @@ class SearchSuggestionParser { DISALLOW_COPY_AND_ASSIGN(SearchSuggestionParser); }; -#endif // COMPONENTS_OMNIBOX_SEARCH_SUGGESTION_PARSER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_SEARCH_SUGGESTION_PARSER_H_ diff --git a/components/omnibox/shortcuts_backend.cc b/components/omnibox/browser/shortcuts_backend.cc similarity index 95% rename from components/omnibox/shortcuts_backend.cc rename to components/omnibox/browser/shortcuts_backend.cc index a28b0cb4b7cc..4fbd7dc8e5f8 100644 --- a/components/omnibox/shortcuts_backend.cc +++ b/components/omnibox/browser/shortcuts_backend.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 "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/shortcuts_backend.h" #include #include @@ -15,13 +15,13 @@ #include "base/strings/string_util.h" #include "base/thread_task_runner_handle.h" #include "components/history/core/browser/history_service.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_match_type.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/base_search_provider.h" -#include "components/omnibox/omnibox_log.h" -#include "components/omnibox/shortcuts_database.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/base_search_provider.h" +#include "components/omnibox/browser/omnibox_log.h" +#include "components/omnibox/browser/shortcuts_database.h" namespace { diff --git a/components/omnibox/shortcuts_backend.h b/components/omnibox/browser/shortcuts_backend.h similarity index 95% rename from components/omnibox/shortcuts_backend.h rename to components/omnibox/browser/shortcuts_backend.h index 5b06f5931eed..957762f76937 100644 --- a/components/omnibox/shortcuts_backend.h +++ b/components/omnibox/browser/shortcuts_backend.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 COMPONENTS_OMNIBOX_SHORTCUTS_BACKEND_H_ -#define COMPONENTS_OMNIBOX_SHORTCUTS_BACKEND_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_BACKEND_H_ +#define COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_BACKEND_H_ #include #include @@ -21,8 +21,8 @@ #include "base/time/time.h" #include "components/history/core/browser/history_service_observer.h" #include "components/keyed_service/core/refcounted_keyed_service.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/shortcuts_database.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/shortcuts_database.h" #include "components/search_engines/search_terms_data.h" #include "url/gurl.h" @@ -171,4 +171,4 @@ class ShortcutsBackend : public RefcountedKeyedService, DISALLOW_COPY_AND_ASSIGN(ShortcutsBackend); }; -#endif // COMPONENTS_OMNIBOX_SHORTCUTS_BACKEND_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_BACKEND_H_ diff --git a/components/omnibox/shortcuts_database.cc b/components/omnibox/browser/shortcuts_database.cc similarity index 98% rename from components/omnibox/shortcuts_database.cc rename to components/omnibox/browser/shortcuts_database.cc index 29fb26d489ad..6981c73d5be4 100644 --- a/components/omnibox/shortcuts_database.cc +++ b/components/omnibox/browser/shortcuts_database.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 "components/omnibox/shortcuts_database.h" +#include "components/omnibox/browser/shortcuts_database.h" #include @@ -10,7 +10,7 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" -#include "components/omnibox/autocomplete_match_type.h" +#include "components/omnibox/browser/autocomplete_match_type.h" #include "sql/meta_table.h" #include "sql/statement.h" #include "sql/transaction.h" diff --git a/components/omnibox/shortcuts_database.h b/components/omnibox/browser/shortcuts_database.h similarity index 96% rename from components/omnibox/shortcuts_database.h rename to components/omnibox/browser/shortcuts_database.h index c942dde8c9e1..968bba4df408 100644 --- a/components/omnibox/shortcuts_database.h +++ b/components/omnibox/browser/shortcuts_database.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 COMPONENTS_OMNIBOX_SHORTCUTS_DATABASE_H_ -#define COMPONENTS_OMNIBOX_SHORTCUTS_DATABASE_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_DATABASE_H_ +#define COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_DATABASE_H_ #include #include @@ -130,4 +130,4 @@ class ShortcutsDatabase : public base::RefCountedThreadSafe { DISALLOW_COPY_AND_ASSIGN(ShortcutsDatabase); }; -#endif // COMPONENTS_OMNIBOX_SHORTCUTS_DATABASE_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_DATABASE_H_ diff --git a/components/omnibox/shortcuts_provider.cc b/components/omnibox/browser/shortcuts_provider.cc similarity index 97% rename from components/omnibox/shortcuts_provider.cc rename to components/omnibox/browser/shortcuts_provider.cc index 6b33313b6e52..962cc1354308 100644 --- a/components/omnibox/shortcuts_provider.cc +++ b/components/omnibox/browser/shortcuts_provider.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 "components/omnibox/shortcuts_provider.h" +#include "components/omnibox/browser/shortcuts_provider.h" #include #include @@ -20,13 +20,13 @@ #include "base/time/time.h" #include "components/history/core/browser/history_service.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider_client.h" -#include "components/omnibox/autocomplete_result.h" -#include "components/omnibox/history_provider.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/url_prefix.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider_client.h" +#include "components/omnibox/browser/autocomplete_result.h" +#include "components/omnibox/browser/history_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/url_prefix.h" #include "components/url_fixer/url_fixer.h" #include "url/third_party/mozilla/url_parse.h" diff --git a/components/omnibox/shortcuts_provider.h b/components/omnibox/browser/shortcuts_provider.h similarity index 93% rename from components/omnibox/shortcuts_provider.h rename to components/omnibox/browser/shortcuts_provider.h index ccc53dc64fdc..2ef5e7f00ddc 100644 --- a/components/omnibox/shortcuts_provider.h +++ b/components/omnibox/browser/shortcuts_provider.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 COMPONENTS_OMNIBOX_SHORTCUTS_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_SHORTCUTS_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_PROVIDER_H_ #include #include #include #include "base/gtest_prod_util.h" -#include "components/omnibox/autocomplete_provider.h" -#include "components/omnibox/shortcuts_backend.h" +#include "components/omnibox/browser/autocomplete_provider.h" +#include "components/omnibox/browser/shortcuts_backend.h" class AutocompleteProviderClient; class ShortcutsProviderTest; @@ -107,4 +107,4 @@ class ShortcutsProvider : public AutocompleteProvider, bool initialized_; }; -#endif // COMPONENTS_OMNIBOX_SHORTCUTS_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_SHORTCUTS_PROVIDER_H_ diff --git a/components/omnibox/suggestion_answer.cc b/components/omnibox/browser/suggestion_answer.cc similarity index 99% rename from components/omnibox/suggestion_answer.cc rename to components/omnibox/browser/suggestion_answer.cc index 540b73f1d47a..8e8b62f5fb18 100644 --- a/components/omnibox/suggestion_answer.cc +++ b/components/omnibox/browser/suggestion_answer.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 "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/suggestion_answer.h b/components/omnibox/browser/suggestion_answer.h similarity index 96% rename from components/omnibox/suggestion_answer.h rename to components/omnibox/browser/suggestion_answer.h index 98e39693ff14..08a2016e2205 100644 --- a/components/omnibox/suggestion_answer.h +++ b/components/omnibox/browser/suggestion_answer.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 COMPONENTS_OMNIBOX_SUGGESTION_ANSWER_H_ -#define COMPONENTS_OMNIBOX_SUGGESTION_ANSWER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_SUGGESTION_ANSWER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_SUGGESTION_ANSWER_H_ #include #include @@ -151,4 +151,4 @@ class SuggestionAnswer { FRIEND_TEST_ALL_PREFIXES(SuggestionAnswerTest, DifferentValuesAreUnequal); }; -#endif // COMPONENTS_OMNIBOX_SUGGESTION_ANSWER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_SUGGESTION_ANSWER_H_ diff --git a/components/omnibox/suggestion_answer_unittest.cc b/components/omnibox/browser/suggestion_answer_unittest.cc similarity index 99% rename from components/omnibox/suggestion_answer_unittest.cc rename to components/omnibox/browser/suggestion_answer_unittest.cc index c876211c2b7c..77a0b9900d82 100644 --- a/components/omnibox/suggestion_answer_unittest.cc +++ b/components/omnibox/browser/suggestion_answer_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 "components/omnibox/suggestion_answer.h" +#include "components/omnibox/browser/suggestion_answer.h" #include "base/json/json_reader.h" #include "base/strings/utf_string_conversions.h" diff --git a/components/omnibox/test_scheme_classifier.cc b/components/omnibox/browser/test_scheme_classifier.cc similarity index 94% rename from components/omnibox/test_scheme_classifier.cc rename to components/omnibox/browser/test_scheme_classifier.cc index 1ea504c97821..df9b0d05dc92 100644 --- a/components/omnibox/test_scheme_classifier.cc +++ b/components/omnibox/browser/test_scheme_classifier.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/test_scheme_classifier.h" +#include "components/omnibox/browser/test_scheme_classifier.h" #include "net/url_request/url_request.h" #include "url/url_constants.h" diff --git a/components/omnibox/test_scheme_classifier.h b/components/omnibox/browser/test_scheme_classifier.h similarity index 70% rename from components/omnibox/test_scheme_classifier.h rename to components/omnibox/browser/test_scheme_classifier.h index 5c7701bd8099..6fdc4e55d698 100644 --- a/components/omnibox/test_scheme_classifier.h +++ b/components/omnibox/browser/test_scheme_classifier.h @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef COMPONENTS_OMNIBOX_TEST_SCHEME_CLASSIFIER_H_ -#define COMPONENTS_OMNIBOX_TEST_SCHEME_CLASSIFIER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_TEST_SCHEME_CLASSIFIER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_TEST_SCHEME_CLASSIFIER_H_ #include "base/macros.h" -#include "components/omnibox/autocomplete_scheme_classifier.h" +#include "components/omnibox/browser/autocomplete_scheme_classifier.h" // The subclass of AutocompleteSchemeClassifier for testing. class TestSchemeClassifier : public AutocompleteSchemeClassifier { @@ -22,4 +22,4 @@ class TestSchemeClassifier : public AutocompleteSchemeClassifier { DISALLOW_COPY_AND_ASSIGN(TestSchemeClassifier); }; -#endif // COMPONENTS_OMNIBOX_TEST_SCHEME_CLASSIFIER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_TEST_SCHEME_CLASSIFIER_H_ diff --git a/components/omnibox/url_index_private_data.cc b/components/omnibox/browser/url_index_private_data.cc similarity index 99% rename from components/omnibox/url_index_private_data.cc rename to components/omnibox/browser/url_index_private_data.cc index 5cc800bd9b4b..a965c86e7a19 100644 --- a/components/omnibox/url_index_private_data.cc +++ b/components/omnibox/browser/url_index_private_data.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 "components/omnibox/url_index_private_data.h" +#include "components/omnibox/browser/url_index_private_data.h" #include #include @@ -25,7 +25,7 @@ #include "components/history/core/browser/history_database.h" #include "components/history/core/browser/history_db_task.h" #include "components/history/core/browser/history_service.h" -#include "components/omnibox/in_memory_url_index.h" +#include "components/omnibox/browser/in_memory_url_index.h" #include "net/base/net_util.h" #if defined(USE_SYSTEM_PROTOBUF) diff --git a/components/omnibox/url_index_private_data.h b/components/omnibox/browser/url_index_private_data.h similarity index 97% rename from components/omnibox/url_index_private_data.h rename to components/omnibox/browser/url_index_private_data.h index b745bf2828ec..13a80bc1a94a 100644 --- a/components/omnibox/url_index_private_data.h +++ b/components/omnibox/browser/url_index_private_data.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 COMPONENTS_OMNIBOX_URL_INDEX_PRIVATE_DATA_H_ -#define COMPONENTS_OMNIBOX_URL_INDEX_PRIVATE_DATA_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_URL_INDEX_PRIVATE_DATA_H_ +#define COMPONENTS_OMNIBOX_BROWSER_URL_INDEX_PRIVATE_DATA_H_ #include #include @@ -12,9 +12,9 @@ #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "components/history/core/browser/history_service.h" -#include "components/omnibox/in_memory_url_index_cache.pb.h" -#include "components/omnibox/in_memory_url_index_types.h" -#include "components/omnibox/scored_history_match.h" +#include "components/omnibox/browser/in_memory_url_index_cache.pb.h" +#include "components/omnibox/browser/in_memory_url_index_types.h" +#include "components/omnibox/browser/scored_history_match.h" class HistoryQuickProviderTest; @@ -407,4 +407,4 @@ class URLIndexPrivateData size_t post_scoring_item_count_; // After performing final filter/scoring. }; -#endif // COMPONENTS_OMNIBOX_URL_INDEX_PRIVATE_DATA_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_URL_INDEX_PRIVATE_DATA_H_ diff --git a/components/omnibox/url_prefix.cc b/components/omnibox/browser/url_prefix.cc similarity index 98% rename from components/omnibox/url_prefix.cc rename to components/omnibox/browser/url_prefix.cc index 86759ded6f11..bc0eab4908a4 100644 --- a/components/omnibox/url_prefix.cc +++ b/components/omnibox/browser/url_prefix.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 "components/omnibox/url_prefix.h" +#include "components/omnibox/browser/url_prefix.h" #include "base/basictypes.h" #include "base/i18n/case_conversion.h" diff --git a/components/omnibox/url_prefix.h b/components/omnibox/browser/url_prefix.h similarity index 94% rename from components/omnibox/url_prefix.h rename to components/omnibox/browser/url_prefix.h index cd25785ef1e1..a0b555dac2f1 100644 --- a/components/omnibox/url_prefix.h +++ b/components/omnibox/browser/url_prefix.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 COMPONENTS_OMNIBOX_URL_PREFIX_H_ -#define COMPONENTS_OMNIBOX_URL_PREFIX_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_URL_PREFIX_H_ +#define COMPONENTS_OMNIBOX_BROWSER_URL_PREFIX_H_ #include @@ -60,4 +60,4 @@ struct URLPrefix { size_t num_components; }; -#endif // COMPONENTS_OMNIBOX_URL_PREFIX_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_URL_PREFIX_H_ diff --git a/components/omnibox/zero_suggest_provider.cc b/components/omnibox/browser/zero_suggest_provider.cc similarity index 97% rename from components/omnibox/zero_suggest_provider.cc rename to components/omnibox/browser/zero_suggest_provider.cc index 63908f732a76..ad75cc0a86ee 100644 --- a/components/omnibox/zero_suggest_provider.cc +++ b/components/omnibox/browser/zero_suggest_provider.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 "components/omnibox/zero_suggest_provider.h" +#include "components/omnibox/browser/zero_suggest_provider.h" #include "base/callback.h" #include "base/i18n/case_conversion.h" @@ -17,14 +17,14 @@ #include "components/history/core/browser/history_types.h" #include "components/history/core/browser/top_sites.h" #include "components/metrics/proto/omnibox_input_type.pb.h" -#include "components/omnibox/autocomplete_classifier.h" -#include "components/omnibox/autocomplete_input.h" -#include "components/omnibox/autocomplete_match.h" -#include "components/omnibox/autocomplete_provider_listener.h" -#include "components/omnibox/history_url_provider.h" -#include "components/omnibox/omnibox_field_trial.h" -#include "components/omnibox/omnibox_pref_names.h" -#include "components/omnibox/search_provider.h" +#include "components/omnibox/browser/autocomplete_classifier.h" +#include "components/omnibox/browser/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_match.h" +#include "components/omnibox/browser/autocomplete_provider_listener.h" +#include "components/omnibox/browser/history_url_provider.h" +#include "components/omnibox/browser/omnibox_field_trial.h" +#include "components/omnibox/browser/omnibox_pref_names.h" +#include "components/omnibox/browser/search_provider.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/search_engines/template_url_service.h" #include "components/variations/net/variations_http_header_provider.h" diff --git a/components/omnibox/zero_suggest_provider.h b/components/omnibox/browser/zero_suggest_provider.h similarity index 95% rename from components/omnibox/zero_suggest_provider.h rename to components/omnibox/browser/zero_suggest_provider.h index 27e56655b6f9..107b11f314c8 100644 --- a/components/omnibox/zero_suggest_provider.h +++ b/components/omnibox/browser/zero_suggest_provider.h @@ -6,16 +6,16 @@ // provider is invoked when the user focuses in the omnibox prior to editing, // and generates search query suggestions based on the current URL. -#ifndef COMPONENTS_OMNIBOX_ZERO_SUGGEST_PROVIDER_H_ -#define COMPONENTS_OMNIBOX_ZERO_SUGGEST_PROVIDER_H_ +#ifndef COMPONENTS_OMNIBOX_BROWSER_ZERO_SUGGEST_PROVIDER_H_ +#define COMPONENTS_OMNIBOX_BROWSER_ZERO_SUGGEST_PROVIDER_H_ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "components/history/core/browser/history_types.h" #include "components/metrics/proto/omnibox_event.pb.h" -#include "components/omnibox/base_search_provider.h" -#include "components/omnibox/search_provider.h" +#include "components/omnibox/browser/base_search_provider.h" +#include "components/omnibox/browser/search_provider.h" #include "net/url_request/url_fetcher_delegate.h" class AutocompleteProviderListener; @@ -162,4 +162,4 @@ class ZeroSuggestProvider : public BaseSearchProvider, DISALLOW_COPY_AND_ASSIGN(ZeroSuggestProvider); }; -#endif // COMPONENTS_OMNIBOX_ZERO_SUGGEST_PROVIDER_H_ +#endif // COMPONENTS_OMNIBOX_BROWSER_ZERO_SUGGEST_PROVIDER_H_ diff --git a/components/open_from_clipboard.gypi b/components/open_from_clipboard.gypi index 103e6d016a2b..27cef25453d5 100644 --- a/components/open_from_clipboard.gypi +++ b/components/open_from_clipboard.gypi @@ -11,7 +11,7 @@ '../base/base.gyp:base', '../url/url.gyp:url_lib', 'components_strings.gyp:components_strings', - 'omnibox', + 'omnibox_browser', ], 'include_dirs': [ '..', diff --git a/components/open_from_clipboard/clipboard_url_provider.cc b/components/open_from_clipboard/clipboard_url_provider.cc index c9358da2a187..30093507405d 100644 --- a/components/open_from_clipboard/clipboard_url_provider.cc +++ b/components/open_from_clipboard/clipboard_url_provider.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "base/strings/utf_string_conversions.h" -#include "components/omnibox/autocomplete_input.h" +#include "components/omnibox/browser/autocomplete_input.h" #include "components/open_from_clipboard/clipboard_recent_content.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" diff --git a/components/open_from_clipboard/clipboard_url_provider.h b/components/open_from_clipboard/clipboard_url_provider.h index 73be03dacef2..af69ae52ab9d 100644 --- a/components/open_from_clipboard/clipboard_url_provider.h +++ b/components/open_from_clipboard/clipboard_url_provider.h @@ -6,7 +6,7 @@ #define COMPONENTS_OPEN_FROM_CLIPBOARD_CLIPBOARD_URL_PROVIDER_H_ #include "base/callback.h" -#include "components/omnibox/autocomplete_provider.h" +#include "components/omnibox/browser/autocomplete_provider.h" class ClipboardRecentContent; -- 2.11.4.GIT