| Index: chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
| diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
| index 5a896518b4950c158196721bb311b55483a2f4cf..86877c6514544ca8ac5d8c33dd7aef0741f01611 100644
|
| --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
| +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc
|
| @@ -70,11 +70,13 @@ using predictors::AutocompleteActionPredictorFactory;
|
| OmniboxEditModel::State::State(bool user_input_in_progress,
|
| const string16& user_text,
|
| const string16& keyword,
|
| - bool is_keyword_hint)
|
| + bool is_keyword_hint,
|
| + bool is_caret_visible)
|
| : user_input_in_progress(user_input_in_progress),
|
| user_text(user_text),
|
| keyword(keyword),
|
| - is_keyword_hint(is_keyword_hint) {
|
| + is_keyword_hint(is_keyword_hint),
|
| + is_caret_visible(is_caret_visible) {
|
| }
|
|
|
| OmniboxEditModel::State::~State() {
|
| @@ -90,6 +92,7 @@ OmniboxEditModel::OmniboxEditModel(OmniboxView* view,
|
| popup_(NULL),
|
| controller_(controller),
|
| has_focus_(false),
|
| + is_caret_visible_(true),
|
| user_input_in_progress_(false),
|
| just_deleted_text_(false),
|
| has_temporary_text_(false),
|
| @@ -128,10 +131,12 @@ const OmniboxEditModel::State OmniboxEditModel::GetStateForTabSwitch() {
|
| }
|
| }
|
|
|
| - return State(user_input_in_progress_, user_text_, keyword_, is_keyword_hint_);
|
| + return State(user_input_in_progress_, user_text_, keyword_, is_keyword_hint_,
|
| + is_caret_visible_);
|
| }
|
|
|
| void OmniboxEditModel::RestoreState(const State& state) {
|
| + SetCaretVisibility(state.is_caret_visible);
|
| // Restore any user editing.
|
| if (state.user_input_in_progress) {
|
| // NOTE: Be sure and set keyword-related state BEFORE invoking
|
| @@ -728,6 +733,13 @@ void OmniboxEditModel::OnSetFocus(bool control_down) {
|
| NotifySearchTabHelper();
|
| }
|
|
|
| +void OmniboxEditModel::SetCaretVisibility(bool visible) {
|
| + if (has_focus_ && visible != is_caret_visible_) {
|
| + is_caret_visible_ = visible;
|
| + view_->ApplyCaretVisibility();
|
| + }
|
| +}
|
| +
|
| void OmniboxEditModel::OnWillKillFocus(gfx::NativeView view_gaining_focus) {
|
| SetInstantSuggestion(InstantSuggestion());
|
|
|
|
|