| 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 "base/basictypes.h" | 8 #include <stddef.h> |
| 9 |
| 9 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 11 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
| 12 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 13 #include "components/metrics/proto/omnibox_event.pb.h" | 15 #include "components/metrics/proto/omnibox_event.pb.h" |
| 14 #include "components/omnibox/browser/autocomplete_controller_delegate.h" | 16 #include "components/omnibox/browser/autocomplete_controller_delegate.h" |
| 15 #include "components/omnibox/browser/autocomplete_input.h" | 17 #include "components/omnibox/browser/autocomplete_input.h" |
| 16 #include "components/omnibox/browser/autocomplete_match.h" | 18 #include "components/omnibox/browser/autocomplete_match.h" |
| 17 #include "components/omnibox/browser/omnibox_controller.h" | 19 #include "components/omnibox/browser/omnibox_controller.h" |
| 18 #include "components/omnibox/common/omnibox_focus_state.h" | 20 #include "components/omnibox/common/omnibox_focus_state.h" |
| 19 #include "ui/base/window_open_disposition.h" | 21 #include "ui/base/window_open_disposition.h" |
| (...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 556 | 558 |
| 557 // The input that was sent to the AutocompleteController. Since no | 559 // The input that was sent to the AutocompleteController. Since no |
| 558 // autocomplete query is started after a tab switch, it is possible for this | 560 // autocomplete query is started after a tab switch, it is possible for this |
| 559 // |input_| to differ from the one currently stored in AutocompleteController. | 561 // |input_| to differ from the one currently stored in AutocompleteController. |
| 560 AutocompleteInput input_; | 562 AutocompleteInput input_; |
| 561 | 563 |
| 562 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel); | 564 DISALLOW_COPY_AND_ASSIGN(OmniboxEditModel); |
| 563 }; | 565 }; |
| 564 | 566 |
| 565 #endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ | 567 #endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_EDIT_MODEL_H_ |
| OLD | NEW |