| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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_POPUP_MODEL_H_ | 5 #ifndef COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_H_ |
| 6 #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_H_ | 6 #define COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include <stddef.h> |
| 9 |
| 10 #include "base/macros.h" |
| 9 #include "base/observer_list.h" | 11 #include "base/observer_list.h" |
| 10 #include "components/omnibox/browser/autocomplete_controller.h" | 12 #include "components/omnibox/browser/autocomplete_controller.h" |
| 11 #include "components/omnibox/browser/autocomplete_result.h" | 13 #include "components/omnibox/browser/autocomplete_result.h" |
| 12 #include "components/omnibox/browser/omnibox_edit_model.h" | 14 #include "components/omnibox/browser/omnibox_edit_model.h" |
| 13 #include "third_party/skia/include/core/SkBitmap.h" | 15 #include "third_party/skia/include/core/SkBitmap.h" |
| 14 | 16 |
| 15 class OmniboxPopupModelObserver; | 17 class OmniboxPopupModelObserver; |
| 16 class OmniboxPopupView; | 18 class OmniboxPopupView; |
| 17 | 19 |
| 18 namespace gfx { | 20 namespace gfx { |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 // The match the user has manually chosen, if any. | 155 // The match the user has manually chosen, if any. |
| 154 AutocompleteResult::Selection manually_selected_match_; | 156 AutocompleteResult::Selection manually_selected_match_; |
| 155 | 157 |
| 156 // Observers. | 158 // Observers. |
| 157 base::ObserverList<OmniboxPopupModelObserver> observers_; | 159 base::ObserverList<OmniboxPopupModelObserver> observers_; |
| 158 | 160 |
| 159 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupModel); | 161 DISALLOW_COPY_AND_ASSIGN(OmniboxPopupModel); |
| 160 }; | 162 }; |
| 161 | 163 |
| 162 #endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_H_ | 164 #endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_POPUP_MODEL_H_ |
| OLD | NEW |