| 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 // This file defines the interface class OmniboxView. Each toolkit will | 5 // This file defines the interface class OmniboxView. Each toolkit will |
| 6 // implement the edit view differently, so that code is inherently platform | 6 // implement the edit view differently, so that code is inherently platform |
| 7 // specific. However, the OmniboxEditModel needs to do some communication with | 7 // specific. However, the OmniboxEditModel needs to do some communication with |
| 8 // the view. Since the model is shared between platforms, we need to define an | 8 // the view. Since the model is shared between platforms, we need to define an |
| 9 // interface that all view implementations will share. | 9 // interface that all view implementations will share. |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "ui/base/window_open_disposition.h" | 24 #include "ui/base/window_open_disposition.h" |
| 25 #include "ui/gfx/native_widget_types.h" | 25 #include "ui/gfx/native_widget_types.h" |
| 26 #include "ui/gfx/range/range.h" | 26 #include "ui/gfx/range/range.h" |
| 27 | 27 |
| 28 class GURL; | 28 class GURL; |
| 29 class OmniboxClient; | 29 class OmniboxClient; |
| 30 class OmniboxEditController; | 30 class OmniboxEditController; |
| 31 class OmniboxViewMacTest; | 31 class OmniboxViewMacTest; |
| 32 class OmniboxEditModel; | 32 class OmniboxEditModel; |
| 33 | 33 |
| 34 namespace gfx { | |
| 35 enum class VectorIconId; | |
| 36 } | |
| 37 | |
| 38 class OmniboxView { | 34 class OmniboxView { |
| 39 public: | 35 public: |
| 40 // Represents the changes between two State objects. This is used by the | 36 // Represents the changes between two State objects. This is used by the |
| 41 // model to determine how its internal state should be updated after the view | 37 // model to determine how its internal state should be updated after the view |
| 42 // state changes. See OmniboxEditModel::OnAfterPossibleChange(). | 38 // state changes. See OmniboxEditModel::OnAfterPossibleChange(). |
| 43 struct StateChanges { | 39 struct StateChanges { |
| 44 // |old_text| and |new_text| are not owned. | 40 // |old_text| and |new_text| are not owned. |
| 45 const base::string16* old_text; | 41 const base::string16* old_text; |
| 46 const base::string16* new_text; | 42 const base::string16* new_text; |
| 47 size_t new_sel_start; | 43 size_t new_sel_start; |
| (...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 friend class OmniboxViewMacTest; | 282 friend class OmniboxViewMacTest; |
| 287 | 283 |
| 288 // |model_| can be NULL in tests. | 284 // |model_| can be NULL in tests. |
| 289 std::unique_ptr<OmniboxEditModel> model_; | 285 std::unique_ptr<OmniboxEditModel> model_; |
| 290 OmniboxEditController* controller_; | 286 OmniboxEditController* controller_; |
| 291 | 287 |
| 292 DISALLOW_COPY_AND_ASSIGN(OmniboxView); | 288 DISALLOW_COPY_AND_ASSIGN(OmniboxView); |
| 293 }; | 289 }; |
| 294 | 290 |
| 295 #endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_VIEW_H_ | 291 #endif // COMPONENTS_OMNIBOX_BROWSER_OMNIBOX_VIEW_H_ |
| OLD | NEW |