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/BUILD.gn b/components/BUILD.gn
index 8c4c3a7..9f2dffc 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -65,7 +65,7 @@
"//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 @@
"//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 @@
"//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 0ba8935..4dd48468 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
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',
],
},
],
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 a8ad942..a801e7013b 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 @@
]
deps = [
- ":omnibox",
+ ":browser",
"//base",
"//components/metrics/proto",
"//testing/gmock",
@@ -142,7 +142,7 @@
]
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 96%
rename from components/omnibox/answers_cache.cc
rename to components/omnibox/browser/answers_cache.cc
index 3ea8a1f4..bc4e0b8 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 688143e..e0be238 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 <list>
@@ -43,4 +43,4 @@
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 e2f42b8..14fd030 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 fa62150..33002d74 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 a1c9527..aca4e06 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 @@
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 1a95519..b4f5b9c 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 <set>
#include <string>
@@ -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 cfd5c870..bcdfc18 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 @@
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 45db535..ede97d8 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 @@
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 98%
rename from components/omnibox/autocomplete_input.cc
rename to components/omnibox/browser/autocomplete_input.cc
index 5ad13c3..d254b610 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 bd3d697..0d2d35b 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 <string>
@@ -227,4 +227,4 @@
std::vector<base::string16> 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 98%
rename from components/omnibox/autocomplete_input_unittest.cc
rename to components/omnibox/browser/autocomplete_input_unittest.cc
index 9272829..a227f38d 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 98%
rename from components/omnibox/autocomplete_match.cc
rename to components/omnibox/browser/autocomplete_match.cc
index 51d68a3..77bcf25 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 940ee4c..bcc9d9a 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 <map>
#include <string>
#include <vector>
#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 std::vector<ACMatchClassification> ACMatchClassifications;
typedef std::vector<AutocompleteMatch> 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 e2ee0ab1..b4f260a 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 fc0e359..fa672cf 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 <string>
@@ -50,4 +50,4 @@
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 6f37c7cc..73fc153 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 7db750a8..7c43ab4 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 97%
rename from components/omnibox/autocomplete_provider.h
rename to components/omnibox/browser/autocomplete_provider.h
index 049e3b9..2046a32 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 @@
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 0b82524..acaa7ac 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 <vector>
@@ -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 @@
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 716a546..8318647 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 @@
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 944ec6f3..da7f1ca 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 <algorithm>
#include <iterator>
@@ -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 eedfe531..d532de6 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 <stddef.h>
@@ -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 @@
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 230a4bf..0e656694 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 <vector>
@@ -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 b94b90b6..42e5d0b 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 <string>
@@ -27,4 +27,4 @@
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 02e1799..028c322b 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 edddc57..dcf1218 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 <map>
#include <string>
@@ -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 @@
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 ef8da84..0800f03 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 97%
rename from components/omnibox/bookmark_provider.cc
rename to components/omnibox/browser/bookmark_provider.cc
index 3eea212..ffce9b8 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 <algorithm>
#include <functional>
@@ -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 79edcd6..2b429f3 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 <string>
-#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 @@
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 95%
rename from components/omnibox/builtin_provider.cc
rename to components/omnibox/browser/builtin_provider.cc
index a364847..43e728b 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 <algorithm>
#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 65b1a3c..4c6a9d5 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 <vector>
#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 @@
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 f78ccb3..004d542b 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 <string>
@@ -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 e7ed8d2..a64b0a6f 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 @@
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 95%
rename from components/omnibox/history_quick_provider.cc
rename to components/omnibox/browser/history_quick_provider.cc
index bf18b40..d2f15cf 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 <vector>
@@ -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 82%
rename from components/omnibox/history_quick_provider.h
rename to components/omnibox/browser/history_quick_provider.h
index c0a8077..d35ecd3 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 <string>
#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 @@
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 98%
rename from components/omnibox/history_url_provider.cc
rename to components/omnibox/browser/history_url_provider.cc
index faa4b2f..7d017352 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 <algorithm>
@@ -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 8bca263..ec7dc81 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 <string>
#include <vector>
@@ -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 @@
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 98%
rename from components/omnibox/in_memory_url_index.cc
rename to components/omnibox/browser/in_memory_url_index.cc
index cdcb7a32..9920013 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 97%
rename from components/omnibox/in_memory_url_index.h
rename to components/omnibox/browser/in_memory_url_index.h
index 58bf210..868d88b 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 <functional>
#include <map>
@@ -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 @@
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 a2e000f..1a658a43 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 <algorithm>
#include <functional>
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 f9e16ee..089559c4 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 <map>
#include <set>
@@ -168,4 +168,4 @@
};
typedef std::map<HistoryID, RowWordStarts> 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 1bc4301..9229d43 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 <algorithm>
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 6cbac9d..78849135 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 08cacaf..1b67b98 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 <string>
@@ -56,4 +56,4 @@
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 c7d8a81..b6f7877 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 <algorithm>
#include <vector>
@@ -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 94%
rename from components/omnibox/keyword_provider.h
rename to components/omnibox/browser/keyword_provider.h
index 63dfa47..3be6313 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 <string>
@@ -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 @@
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 720811f..15be17c 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 f1a0d27..c7f0cd6 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 4f133df..fc73c1f 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 <string>
-#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 669c213..1ef2efe 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 <cmath>
#include <string>
@@ -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 9a8cad70..3bf5179 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 <map>
#include <string>
@@ -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 @@
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 fe302714..38e2252 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 95%
rename from components/omnibox/omnibox_log.cc
rename to components/omnibox/browser/omnibox_log.cc
index 51924b8..7f6b820 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 4cb584b..7a64244 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 <stddef.h>
@@ -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 @@
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 f08aca7..1a2e8ed 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 @@
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 d50b3e5..57823da 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 @@
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 ea18080..3d3a5495 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 b24a4c9..46339d5 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 @@
} // 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 91%
rename from components/omnibox/omnibox_switches.cc
rename to components/omnibox/browser/omnibox_switches.cc
index 64607b5..ced6133 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 c259ff2..0123460 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 @@
} // 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 98%
rename from components/omnibox/scored_history_match.cc
rename to components/omnibox/browser/scored_history_match.cc
index 5f05d34..0c058d6 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 <math.h>
@@ -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 055e635..a4da02e 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 <string>
#include <vector>
@@ -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 @@
};
typedef std::vector<ScoredHistoryMatch> 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 5714bcc..b6ff8ab 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 <algorithm>
diff --git a/components/omnibox/search_provider.cc b/components/omnibox/browser/search_provider.cc
similarity index 98%
rename from components/omnibox/search_provider.cc
rename to components/omnibox/browser/search_provider.cc
index d70513a6..05f9cc5 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 <algorithm>
#include <cmath>
@@ -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 fc5b900..51f5e6c8 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 <string>
#include <vector>
@@ -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 @@
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 98%
rename from components/omnibox/search_suggestion_parser.cc
rename to components/omnibox/browser/search_suggestion_parser.cc
index 1e04d5f..9c411fca 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 <algorithm>
@@ -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 e86affb..3ecb78e 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 <string>
#include <vector>
@@ -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 @@
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 a28b0cb4..4fbd7dc 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 <map>
#include <string>
@@ -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 5b06f59..957762f 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 <map>
#include <string>
@@ -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 @@
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 29fb26d4..6981c73 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 <string>
@@ -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 c942dde..968bba4 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 <map>
#include <string>
@@ -130,4 +130,4 @@
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 6b33313b..962cc13 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 <algorithm>
#include <cmath>
@@ -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 ccc53dc..2ef5e7f0 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 <map>
#include <set>
#include <string>
#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 @@
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 98%
rename from components/omnibox/suggestion_answer.cc
rename to components/omnibox/browser/suggestion_answer.cc
index 540b73f..8e8b62f5 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 98e39693..08a2016 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 <string>
#include <vector>
@@ -151,4 +151,4 @@
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 c876211..77a0b99 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 1ea504c9..df9b0d0 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 5c7701b..6fdc4e5 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 @@
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 5cc800bd..a965c86 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 <functional>
#include <iterator>
@@ -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 b745bf2..13a80bc1 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 <set>
#include <string>
@@ -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 @@
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 86759de..bc0eab490 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 cd25785..a0b555d 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 <vector>
@@ -60,4 +60,4 @@
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 96%
rename from components/omnibox/zero_suggest_provider.cc
rename to components/omnibox/browser/zero_suggest_provider.cc
index 63908f7..ad75cc0 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 27e56655..107b11f3 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 @@
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 103e6d0..27cef25 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 c9358da2..30093507 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 73be03da..af69ae5 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;
