| Index: chrome/browser/ui/omnibox/omnibox_edit_model.h
|
| diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.h b/chrome/browser/ui/omnibox/omnibox_edit_model.h
|
| index 81890f3c5adc5f07bf553c73dfc637c7bdf4daf9..1f93f95057d40f49b20c6e6bf22e8f973410ea37 100644
|
| --- a/chrome/browser/ui/omnibox/omnibox_edit_model.h
|
| +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.h
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h"
|
| #include "chrome/browser/autocomplete/autocomplete_match.h"
|
| #include "chrome/common/metrics/proto/omnibox_event.pb.h"
|
| +#include "chrome/common/omnibox_types.h"
|
| #include "content/public/common/page_transition_types.h"
|
| #include "googleurl/src/gurl.h"
|
| #include "ui/base/window_open_disposition.h"
|
| @@ -32,33 +33,6 @@ class Image;
|
| class Rect;
|
| }
|
|
|
| -// 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_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,
|
| -};
|
| -
|
| class OmniboxEditModel : public AutocompleteControllerDelegate {
|
| public:
|
| struct State {
|
|
|