Componentize //chrome/common/omnibox_focus_state.h
Requires the creation of //components/omnibox/common.
BUG=371536
TBR=sky
Review URL: https://codereview.chromium.org/1224203003
Cr-Commit-Position: refs/heads/master@{#338018}
diff --git a/chrome/DEPS b/chrome/DEPS
index e014b07f..c703001 100644
--- a/chrome/DEPS
+++ b/chrome/DEPS
@@ -19,6 +19,7 @@
"+chrome/test",
"+components/content_settings/core/common",
"+components/error_page/common",
+ "+components/omnibox/common",
"+components/url_fixer",
"+components/variations",
"+content/public/common",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 5364d32..4b598f58 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -57,7 +57,7 @@
"+components/navigation_metrics",
"+components/network_hints",
"+components/network_time",
- "+components/omnibox",
+ "+components/omnibox/browser",
"+components/os_crypt",
"+components/password_manager",
"+components/pdf/browser",
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 395db429..cb11a082 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -50,6 +50,7 @@
"//components/auto_login_parser",
"//components/dom_distiller/webui",
"//components/invalidation/impl",
+ "//components/omnibox/common",
"//components/onc",
"//components/password_manager/core/browser",
"//components/resources",
diff --git a/chrome/browser/ui/omnibox/omnibox_current_page_delegate.h b/chrome/browser/ui/omnibox/omnibox_current_page_delegate.h
index 816bf6a..4676ce0 100644
--- a/chrome/browser/ui/omnibox/omnibox_current_page_delegate.h
+++ b/chrome/browser/ui/omnibox/omnibox_current_page_delegate.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "chrome/common/instant_types.h"
-#include "chrome/common/omnibox_focus_state.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "ui/base/window_open_disposition.h"
class GURL;
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
index 853f857..2a03610 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
@@ -12,11 +12,11 @@
#include "base/time/time.h"
#include "chrome/browser/ui/omnibox/omnibox_controller.h"
#include "chrome/common/instant_types.h"
-#include "chrome/common/omnibox_focus_state.h"
#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/omnibox/browser/autocomplete_controller_delegate.h"
#include "components/omnibox/browser/autocomplete_input.h"
#include "components/omnibox/browser/autocomplete_match.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "ui/base/window_open_disposition.h"
#include "ui/gfx/native_widget_types.h"
#include "url/gurl.h"
diff --git a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
index 761dd95..d142754 100644
--- a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
@@ -15,12 +15,12 @@
#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/browser/ui/search/instant_test_utils.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/omnibox_focus_state.h"
#include "chrome/common/search_types.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/interactive_test_utils.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/ui/search/search_ipc_router.h b/chrome/browser/ui/search/search_ipc_router.h
index 899bdcd0..0f62aba 100644
--- a/chrome/browser/ui/search/search_ipc_router.h
+++ b/chrome/browser/ui/search/search_ipc_router.h
@@ -12,7 +12,7 @@
#include "base/time/time.h"
#include "chrome/common/instant_types.h"
#include "chrome/common/ntp_logging_events.h"
-#include "chrome/common/omnibox_focus_state.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "content/public/browser/web_contents_observer.h"
#include "ui/base/window_open_disposition.h"
diff --git a/chrome/browser/ui/search/search_ipc_router_unittest.cc b/chrome/browser/ui/search/search_ipc_router_unittest.cc
index fac9a27..c1e997f 100644
--- a/chrome/browser/ui/search/search_ipc_router_unittest.cc
+++ b/chrome/browser/ui/search/search_ipc_router_unittest.cc
@@ -21,11 +21,11 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/instant_types.h"
#include "chrome/common/ntp_logging_events.h"
-#include "chrome/common/omnibox_focus_state.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/browser_with_test_window_test.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "components/search_engines/template_url_service.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index f543cee..cfcbcdd 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -16,7 +16,7 @@
#include "chrome/browser/ui/search/search_model.h"
#include "chrome/common/instant_types.h"
#include "chrome/common/ntp_logging_events.h"
-#include "chrome/common/omnibox_focus_state.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
#include "ui/base/window_open_disposition.h"
diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc
index 71af90e6..e3269d7f 100644
--- a/chrome/browser/ui/search/search_tab_helper_unittest.cc
+++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc
@@ -23,7 +23,6 @@
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/ntp_logging_events.h"
-#include "chrome/common/omnibox_focus_state.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "chrome/grit/generated_resources.h"
@@ -31,6 +30,7 @@
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "components/search_engines/template_url_service.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index b54ba7b..51dbe3c0 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -2748,6 +2748,7 @@
'../components/components.gyp:dom_distiller_core',
'../components/components.gyp:dom_distiller_webui',
'../components/components.gyp:invalidation_impl',
+ '../components/components.gyp:omnibox_common',
'../components/components.gyp:onc_component',
'../components/components.gyp:password_manager_core_browser',
'../components/components.gyp:sync_driver',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 3b32290..728e85f1 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -79,7 +79,6 @@
'common/multi_process_lock_linux.cc',
'common/multi_process_lock_mac.cc',
'common/multi_process_lock_win.cc',
- 'common/omnibox_focus_state.h',
'common/partial_circular_buffer.cc',
'common/partial_circular_buffer.h',
'common/pref_names_util.cc',
@@ -335,6 +334,7 @@
'<(DEPTH)/components/components.gyp:favicon_base',
'<(DEPTH)/components/components.gyp:json_schema',
'<(DEPTH)/components/components.gyp:metrics',
+ '<(DEPTH)/components/components.gyp:omnibox_common',
'<(DEPTH)/components/components.gyp:policy_component_common',
'<(DEPTH)/components/components.gyp:translate_core_common',
'<(DEPTH)/components/components.gyp:variations',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index 4413ddf..56896072 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -258,6 +258,7 @@
'../components/components.gyp:data_reduction_proxy_core_common',
'../components/components.gyp:guest_view_renderer',
'../components/components.gyp:network_hints_renderer',
+ '../components/components.gyp:omnibox_common',
'../components/components.gyp:error_page_renderer',
'../components/components.gyp:startup_metric_utils',
'../components/components.gyp:password_manager_content_renderer',
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index c9618035..4aac64f2 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -63,6 +63,7 @@
"//components/favicon_base",
"//components/json_schema",
"//components/metrics",
+ "//components/omnibox/common",
"//components/policy:policy_component_common",
"//components/translate/core/common",
"//components/variations",
diff --git a/chrome/common/omnibox_focus_state.h b/chrome/common/omnibox_focus_state.h
deleted file mode 100644
index 593399d..0000000
--- a/chrome/common/omnibox_focus_state.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_COMMON_OMNIBOX_FOCUS_STATE_H_
-#define CHROME_COMMON_OMNIBOX_FOCUS_STATE_H_
-
-// Omnibox focus state.
-enum OmniboxFocusState {
- // Not focused.
- OMNIBOX_FOCUS_NONE,
-
- // Visibly focused.
- OMNIBOX_FOCUS_VISIBLE,
-
- // Invisibly focused, i.e. focused with a hidden caret.
- //
- // Omnibox will not look focused visibly but any user key strokes will go to
- // the omnibox.
- OMNIBOX_FOCUS_INVISIBLE,
-
- OMNIBOX_FOCUS_STATE_LAST = OMNIBOX_FOCUS_INVISIBLE
-};
-
-// Reasons why the Omnibox focus state could change.
-enum OmniboxFocusChangeReason {
- // Includes any explicit changes to focus. (e.g. user clicking to change
- // focus, user tabbing to change focus, any explicit calls to SetFocus,
- // etc.)
- OMNIBOX_FOCUS_CHANGE_EXPLICIT,
-
- // Focus changed to restore state from a tab the user switched to.
- OMNIBOX_FOCUS_CHANGE_TAB_SWITCH,
-
- // Focus changed because user started typing. This only happens when focus
- // state is INVISIBLE (and this results in a change to VISIBLE).
- OMNIBOX_FOCUS_CHANGE_TYPING,
-
- OMNIBOX_FOCUS_CHANGE_REASON_LAST = OMNIBOX_FOCUS_CHANGE_TYPING
-};
-
-#endif // CHROME_COMMON_OMNIBOX_FOCUS_STATE_H_
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index b413670..4a9ab4e 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -20,12 +20,12 @@
#include "chrome/common/common_param_traits.h"
#include "chrome/common/instant_types.h"
#include "chrome/common/ntp_logging_events.h"
-#include "chrome/common/omnibox_focus_state.h"
#include "chrome/common/search_provider.h"
#include "chrome/common/web_application_info.h"
#include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
#include "components/nacl/common/nacl_types.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "content/public/common/common_param_traits.h"
#include "content/public/common/referrer.h"
#include "content/public/common/top_controls_state.h"
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
index f742ada..5912f86e 100644
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -44,6 +44,7 @@
"//components/error_page/renderer",
"//components/guest_view/renderer",
"//components/network_hints/renderer",
+ "//components/omnibox/common",
"//components/password_manager/content/renderer",
"//components/plugins/renderer",
"//components/printing/renderer:printing_renderer",
diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc
index 92080bf..8d84d8c 100644
--- a/chrome/renderer/searchbox/searchbox.cc
+++ b/chrome/renderer/searchbox/searchbox.cc
@@ -13,7 +13,6 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/omnibox_focus_state.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/url_constants.h"
#include "chrome/renderer/searchbox/searchbox_extension.h"
@@ -21,6 +20,7 @@
#include "components/favicon_base/favicon_types.h"
#include "components/favicon_base/favicon_url_parser.h"
#include "components/favicon_base/large_icon_url_parser.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "net/base/escape.h"
diff --git a/chrome/renderer/searchbox/searchbox.h b/chrome/renderer/searchbox/searchbox.h
index 5cf040b..a71cd1be 100644
--- a/chrome/renderer/searchbox/searchbox.h
+++ b/chrome/renderer/searchbox/searchbox.h
@@ -12,8 +12,8 @@
#include "base/strings/string16.h"
#include "chrome/common/instant_types.h"
#include "chrome/common/ntp_logging_events.h"
-#include "chrome/common/omnibox_focus_state.h"
#include "chrome/renderer/instant_restricted_id_cache.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
#include "content/public/renderer/render_view_observer.h"
#include "content/public/renderer/render_view_observer_tracker.h"
#include "ui/base/window_open_disposition.h"
