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