| Index: chrome/browser/ui/views/omnibox/omnibox_view_views.h
|
| diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
|
| index b12098d3e296bf865ad06f843b5990c5e8b9d5e6..9be20cbddb78230bc0cd2dcfb825dad5dfd24c3e 100644
|
| --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
|
| +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
|
| @@ -89,7 +89,7 @@ class OmniboxViewViews
|
| base::string16 GetText() const override;
|
| void SetUserText(const base::string16& text,
|
| bool update_popup) override;
|
| - void SetForcedQuery() override;
|
| + void EnterKeywordModeForDefaultSearchProvider() override;
|
| void GetSelectionBounds(base::string16::size_type* start,
|
| base::string16::size_type* end) const override;
|
| void SelectAll(bool reversed) override;
|
| @@ -222,8 +222,7 @@ class OmniboxViewViews
|
| gfx::Range saved_selection_for_focus_change_;
|
|
|
| // Tracking state before and after a possible change.
|
| - base::string16 text_before_change_;
|
| - gfx::Range sel_before_change_;
|
| + State state_before_change_;
|
| bool ime_composing_before_change_;
|
|
|
| // Was the delete key pressed with an empty selection at the end of the edit?
|
|
|