| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/strings/string16.h" | 11 #include "base/strings/string16.h" |
| 12 #include "chrome/browser/autocomplete/autocomplete_controller.h" | 12 #include "chrome/browser/autocomplete/autocomplete_controller.h" |
| 13 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" | 13 #include "chrome/browser/autocomplete/autocomplete_controller_delegate.h" |
| 14 #include "components/autocomplete/autocomplete_match.h" | 14 #include "components/omnibox/autocomplete_match.h" |
| 15 | 15 |
| 16 class AUtocompleteInput; | 16 class AUtocompleteInput; |
| 17 struct AutocompleteMatch; | 17 struct AutocompleteMatch; |
| 18 class AutocompleteResult; | 18 class AutocompleteResult; |
| 19 class InstantController; | 19 class InstantController; |
| 20 class OmniboxEditModel; | 20 class OmniboxEditModel; |
| 21 class OmniboxPopupModel; | 21 class OmniboxPopupModel; |
| 22 class Profile; | 22 class Profile; |
| 23 | 23 |
| 24 namespace gfx { | 24 namespace gfx { |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 // TODO(beaudoin): This AutocompleteMatch is used to let the OmniboxEditModel | 87 // TODO(beaudoin): This AutocompleteMatch is used to let the OmniboxEditModel |
| 88 // know what it should display. Not every field is required for that purpose, | 88 // know what it should display. Not every field is required for that purpose, |
| 89 // but the ones specifically needed are unclear. We should therefore spend | 89 // but the ones specifically needed are unclear. We should therefore spend |
| 90 // some time to extract these fields and use a tighter structure here. | 90 // some time to extract these fields and use a tighter structure here. |
| 91 AutocompleteMatch current_match_; | 91 AutocompleteMatch current_match_; |
| 92 | 92 |
| 93 DISALLOW_COPY_AND_ASSIGN(OmniboxController); | 93 DISALLOW_COPY_AND_ASSIGN(OmniboxController); |
| 94 }; | 94 }; |
| 95 | 95 |
| 96 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ | 96 #endif // CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_CONTROLLER_H_ |
| OLD | NEW |