diff options
| author | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 11:53:17 +0000 |
|---|---|---|
| committer | hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-07 11:53:17 +0000 |
| commit | b1c5ab68e194ac42b9d52ec84fca2d638af03cfd (patch) | |
| tree | 5f591e3e1a390c1e66627a61c14ffd7232b79867 /athena | |
| parent | 8f5e8650ae36927813a91ced3cacaddbb5667125 (diff) | |
| download | chromium_src-b1c5ab68e194ac42b9d52ec84fca2d638af03cfd.zip chromium_src-b1c5ab68e194ac42b9d52ec84fca2d638af03cfd.tar.gz chromium_src-b1c5ab68e194ac42b9d52ec84fca2d638af03cfd.tar.bz2 | |
Rename components/autocomplete to components/omnibox
components/omnibox will be the directory to which code under chrome/browser/{autocomplete,omnibox} will move.
(https://codereview.chromium.org/415073003#msg7)
BUG=371538
TEST=build
R=blundell@chromium.org, pkasting@chromium.org
TBR=mukai@chromium.org for athena/, sky@chromium.org for include fix under chrome/
Review URL: https://codereview.chromium.org/443043003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/main/DEPS | 2 | ||||
| -rw-r--r-- | athena/main/athena_main.gyp | 2 | ||||
| -rw-r--r-- | athena/main/url_search_provider.cc | 6 | ||||
| -rw-r--r-- | athena/main/url_search_provider.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/athena/main/DEPS b/athena/main/DEPS index 7919595..2903175 100644 --- a/athena/main/DEPS +++ b/athena/main/DEPS @@ -8,8 +8,8 @@ include_rules = [ "+athena/task/public", "+athena/virtual_keyboard/public", "+athena/wm/public", - "+components/autocomplete", "+components/metrics/proto", + "+components/omnibox", "+components/search_engines", "+content/public", "+grit", diff --git a/athena/main/athena_main.gyp b/athena/main/athena_main.gyp index c5ad8ef..1b818b1 100644 --- a/athena/main/athena_main.gyp +++ b/athena/main/athena_main.gyp @@ -19,13 +19,13 @@ # is removed. '../../ash/ash_resources.gyp:ash_resources', '../../chromeos/chromeos.gyp:power_manager_proto', - '../../components/components.gyp:autocomplete', '../../components/components.gyp:component_metrics_proto', '../../components/components.gyp:history_core_browser', # infobars_test_support is required to declare some symbols used in the # search_engines and its dependencies. See crbug.com/386171 # TODO(mukai): declare those symbols for Athena. '../../components/components.gyp:infobars_test_support', + '../../components/components.gyp:omnibox', '../../components/components.gyp:search_engines', '../../extensions/shell/app_shell.gyp:app_shell_lib', '../../skia/skia.gyp:skia', diff --git a/athena/main/url_search_provider.cc b/athena/main/url_search_provider.cc index 01eb674..6ab9498 100644 --- a/athena/main/url_search_provider.cc +++ b/athena/main/url_search_provider.cc @@ -8,11 +8,11 @@ #include "athena/activity/public/activity_manager.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" -#include "components/autocomplete/autocomplete_input.h" -#include "components/autocomplete/autocomplete_scheme_classifier.h" -#include "components/autocomplete/search_suggestion_parser.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_scheme_classifier.h" +#include "components/omnibox/search_suggestion_parser.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" diff --git a/athena/main/url_search_provider.h b/athena/main/url_search_provider.h index 1d8406c..632d01a 100644 --- a/athena/main/url_search_provider.h +++ b/athena/main/url_search_provider.h @@ -6,7 +6,7 @@ #define ATHENA_MAIN_URL_SEARCH_PROVIDER_H_ #include "base/memory/scoped_ptr.h" -#include "components/autocomplete/autocomplete_input.h" +#include "components/omnibox/autocomplete_input.h" #include "net/url_request/url_fetcher_delegate.h" #include "ui/app_list/search_provider.h" |