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}
diff --git a/components/omnibox.gypi b/components/omnibox.gypi
index 955797e..0442d46 100644
--- a/components/omnibox.gypi
+++ b/components/omnibox.gypi
@@ -5,8 +5,8 @@
{
'targets': [
{
- # GN version: //components/omnibox
- 'target_name': 'omnibox',
+ # GN version: //components/omnibox/browser
+ 'target_name': 'omnibox_browser',
'type': 'static_library',
'dependencies': [
'../base/base.gyp:base',
@@ -39,76 +39,76 @@
],
'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',
+ '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',
],
},
{
@@ -117,10 +117,10 @@
# 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', ],
+ 'sources': [ 'omnibox/browser/in_memory_url_index_cache.proto', ],
'variables': {
- 'proto_in_dir': 'omnibox',
- 'proto_out_dir': 'components/omnibox',
+ 'proto_in_dir': 'omnibox/browser',
+ 'proto_out_dir': 'components/omnibox/browser',
},
'includes': [ '../build/protoc.gypi', ],
},
@@ -131,7 +131,7 @@
'dependencies': [
'../base/base.gyp:base',
'../testing/gmock.gyp:gmock',
- 'omnibox',
+ 'omnibox_browser',
'component_metrics_proto',
],
'include_dirs': [
@@ -139,10 +139,10 @@
],
'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',
+ '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',
],
},
],
