| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ | 5 #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ |
| 6 #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ | 6 #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 FAKEBOX = 2 | 57 FAKEBOX = 2 |
| 58 }; | 58 }; |
| 59 | 59 |
| 60 struct State { | 60 struct State { |
| 61 State(bool user_input_in_progress, | 61 State(bool user_input_in_progress, |
| 62 const base::string16& user_text, | 62 const base::string16& user_text, |
| 63 const base::string16& gray_text, | 63 const base::string16& gray_text, |
| 64 const base::string16& keyword, | 64 const base::string16& keyword, |
| 65 bool is_keyword_hint, | 65 bool is_keyword_hint, |
| 66 KeywordModeEntryMethod keyword_mode_entry_method, | 66 KeywordModeEntryMethod keyword_mode_entry_method, |
| 67 bool url_replacement_enabled, | |
| 68 OmniboxFocusState focus_state, | 67 OmniboxFocusState focus_state, |
| 69 FocusSource focus_source, | 68 FocusSource focus_source, |
| 70 const AutocompleteInput& autocomplete_input); | 69 const AutocompleteInput& autocomplete_input); |
| 71 State(const State& other); | 70 State(const State& other); |
| 72 ~State(); | 71 ~State(); |
| 73 | 72 |
| 74 bool user_input_in_progress; | 73 bool user_input_in_progress; |
| 75 const base::string16 user_text; | 74 const base::string16 user_text; |
| 76 const base::string16 gray_text; | 75 const base::string16 gray_text; |
| 77 const base::string16 keyword; | 76 const base::string16 keyword; |
| 78 const bool is_keyword_hint; | 77 const bool is_keyword_hint; |
| 79 KeywordModeEntryMethod keyword_mode_entry_method; | 78 KeywordModeEntryMethod keyword_mode_entry_method; |
| 80 bool url_replacement_enabled; | |
| 81 OmniboxFocusState focus_state; | 79 OmniboxFocusState focus_state; |
| 82 FocusSource focus_source; | 80 FocusSource focus_source; |
| 83 const AutocompleteInput autocomplete_input; | 81 const AutocompleteInput autocomplete_input; |
| 84 }; | 82 }; |
| 85 | 83 |
| 86 OmniboxEditModel(OmniboxView* view, | 84 OmniboxEditModel(OmniboxView* view, |
| 87 OmniboxEditController* controller, | 85 OmniboxEditController* controller, |
| 88 std::unique_ptr<OmniboxClient> client); | 86 std::unique_ptr<OmniboxClient> client); |
| 89 virtual ~OmniboxEditModel(); | 87 virtual ~OmniboxEditModel(); |
| 90 | 88 |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 572 | 570 |
| 573 // The input that was sent to the AutocompleteController. Since no | 571 // The input that was sent to the AutocompleteController. Since no |
| 574 // autocomplete query is started after a tab switch, it is possible for this | 572 // autocomplete query is started after a tab switch, it is possible for this |
| 575 // |input_| to differ from the one currently stored in AutocompleteController. | 573 // |input_| to differ from the one currently stored in AutocompleteController. |
| 576 AutocompleteInput input_; | 574 AutocompleteInput input_; |
| 577 | 575 |
| 578 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel); | 576 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel); |
| 579 }; | 577 }; |
| 580 | 578 |
| 581 #endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ | 579 #endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ |
| OLD | NEW |